Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

netdata: 1.10.0 -> 1.11.0 #50459

Merged
merged 3 commits into from Nov 17, 2018
Merged

netdata: 1.10.0 -> 1.11.0 #50459

merged 3 commits into from Nov 17, 2018

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Nov 16, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Nov 16, 2018

Great a new release, I also have some patches that fixes most of the plugins:

Mic92@a61a1d3

Mic92@d99537c

@Mic92
Copy link
Member

Mic92 commented Nov 16, 2018

Can you incoperate those? Especially --sysconfdir=/etc and the lookup order of plugins is important: Mic92@d99537c

marsam and others added 3 commits November 16, 2018 11:24
@marsam
netdata: 1.10.0 -> 1.11.0
49ac683
@Mic92 @marsam
netdata: Disable files in /etc and /var
d417ca7
@Mic92 @marsam
nixos/netdata: own plugins must the looked up first
348b7b8 
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
@marsam
Copy link
Contributor Author

marsam commented Nov 16, 2018

@Mic92 sure, I've cherry-picked both commits and adapted the patch to the released tarball

@Mic92 Mic92 merged commit dfd77bc into NixOS:master Nov 17, 2018
@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

works! https://netdata.thalheim.io

@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

@GrahamcOfBorg build netdata

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: netdata

Partial log (click to expand)

/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/python.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/tc-qos-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/alarm-email.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/fping.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/alarm-notify.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/cgroup-network-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/charts.d.dryrun-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
/nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/libexec/netdata/plugins.d/node.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0...
moving /nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/sbin/* to /nix/store/lrl54ygmarisd9p6jdx2f273m59ggp8q-netdata-1.11.0/bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: netdata

Partial log (click to expand)

/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/alarm-test.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/cgroup-name.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/cgroup-network-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/charts.d.dryrun-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/charts.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/fping.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/node.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/python.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
/nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/libexec/netdata/plugins.d/tc-qos-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n9hba031gjky8hpjgx9fnlaxhidyzxbz-bash-4.4-p23/bin/bash"
moving /nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/sbin/* to /nix/store/dr2vyh26w7j8wapwirkpj3lcgp0gc55y-netdata-1.11.0/bin

@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

I think we should backport this one. Because before most plugins where unusable.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: netdata

Partial log (click to expand)

/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/tc-qos-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/python.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/node.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/fping.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/charts.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/charts.d.dryrun-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/cgroup-network-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
/nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/libexec/netdata/plugins.d/cgroup-name.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0...
moving /nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/sbin/* to /nix/store/nfffla7iwygv0sqbpm3r1y2pibbxfcqj-netdata-1.11.0/bin

@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

backport:

[detached HEAD 74592d6] netdata: 1.10.0 -> 1.11.0
Author: Mario Rodas marsam@users.noreply.github.com
Date: Wed Nov 14 11:01:41 2018 -0500
2 files changed, 15 insertions(+), 16 deletions(-)
[detached HEAD aa31685] netdata: Disable files in /etc and /var
Date: Fri Oct 12 09:53:36 2018 +0100
2 files changed, 90 insertions(+), 4 deletions(-)
create mode 100644 pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
[detached HEAD 34ff87e] nixos/netdata: own plugins must the looked up first
Date: Fri Oct 12 09:57:45 2018 +0100
2 files changed, 8 insertions(+), 2 deletions(-)

This was referenced Nov 17, 2018
Closed
Closed
@marsam marsam deleted the feature/netdata-darwin branch November 17, 2018 19:45
@yesbox yesbox mentioned this pull request Nov 21, 2018
Closed
Mic92 added a commit to Mic92/nixpkgs that referenced this pull request Nov 21, 2018
@Mic92
netdata: create missing /etc/netdata
769735d 
Since netdata 1.11.0 updated in NixOS#50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes NixOS#50893
@Mic92 Mic92 mentioned this pull request Nov 21, 2018
Merged
9 tasks
Mic92 added a commit that referenced this pull request Nov 21, 2018
@Mic92
netdata: create missing /etc/netdata
21517c6 
Since netdata 1.11.0 updated in #50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marsam @Mic92 @GrahamcOfBorg @yesbox