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.9.0 -> 1.10.0 #44472

Merged
merged 1 commit into from Aug 4, 2018
Merged

netdata: 1.9.0 -> 1.10.0 #44472

merged 1 commit into from Aug 4, 2018

Conversation

yesbox
Copy link
Contributor

@yesbox yesbox commented Aug 4, 2018 •
edited

The web_access.patch would no longer apply. It disabled a check that required the static files for the web UI to be owned by the user the daemon runs as (not root, so it doesn't work well with nix).

Besides updating netdata, this commit removes that patch, changes the netdata service config to set the "web files owner/group" option to "root" and adds a test that checks that the web UI is being served.

This allows the web files to be owned by root without patching.

  • 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/) - Only via the service, without the proper config netdata will not run correctly.
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@yesbox
netdata: 1.9.0 -> 1.10.0
dc32959 
The web_access.patch would no longer apply.
It disabled a check that required the static files
for the web UI to be owned by the user the daemon runs as
(not root, so it doesn't work well with nix).

Besides updating netdata, this commit removes that patch,
changes the netdata service config to set the "web files owner/group"
option to "root" and adds a test that checks that the web UI is being served.

This allows the web files to be owned by root without patching.
@yesbox
Copy link
Contributor Author

yesbox commented Aug 4, 2018

Ping maintainer @lethalman.

@xeji
Copy link
Contributor

xeji commented Aug 4, 2018

@GrahamcOfBorg build netdata

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: netdata

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: netdata

Partial log (click to expand)

/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/alarm-email.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/node.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/alarm-test.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/cgroup-network-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/charts.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/fping.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/plugins.d/tc-qos-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
/nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/libexec/netdata/python.d/python-modules-installer.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0...
moving /nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/sbin/* to /nix/store/hnf5xkv2ck5979629jf376z1wv5l0nni-netdata-1.10.0/bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: netdata

Partial log (click to expand)

/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/charts.d.plugin: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/charts.d.dryrun-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/cgroup-network-helper.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/cgroup-name.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/alarm-test.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/alarm-notify.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/libexec/netdata/plugins.d/alarm-email.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0...
moving /nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/sbin/* to /nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0/bin
/nix/store/shq65l9j1hsnw66nq8666giag71jjzam-netdata-1.10.0

@xeji
Copy link
Contributor

xeji commented Aug 4, 2018

@GrahamcOfBorg test netdata

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: tests.netdata

Partial log (click to expand)

building '/nix/store/6zd08p7x39qjhcbpj5wpirgsdvxlf89p-user-units.drv'...
building '/nix/store/p7pd62zm8vn2bk10jcpwk71syilbc6zw-system-units.drv'...
cannot build derivation '/nix/store/74kizcs8b3r5119az6jl1hw4nmj5xw5y-etc.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/khjq173ymbdyffxjvwv92wz4cy4jkxwz-nixos-system-netdata-18.09.git.e9e20f0.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/nhc85j6pvxkzigihs0gmjy80z1v13rky-closure-info.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2yl3pfg5y738mm2hqh2gfa7alz7rp446-run-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/adybg5q4dk6q1gsfhzj2z3i5hd0q4f6a-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/lv9xba02iyp5f7yz97hzj6k0nwvjxj3y-nixos-test-driver-netdata.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2h95lafiim8pjjxdnnj1zyhnq66d5bjz-vm-test-run-netdata.drv': 1 dependencies couldn't be built
error: build of '/nix/store/2h95lafiim8pjjxdnnj1zyhnq66d5bjz-vm-test-run-netdata.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.netdata

Partial log (click to expand)

netdata: exit status 1
syncing
netdata: running command: sync
netdata: exit status 0
test script finished in 27.61s
cleaning up
killing netdata (pid 631)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/jp6fdphy17g0dda4rrrx15k7af602jbg-vm-test-run-netdata

@xeji
Copy link
Contributor

xeji commented Aug 4, 2018

nixos/tests/netdata succeeds locally on x86_64-linux. LGTM.

@xeji xeji merged commit 0254ae4 into NixOS:master Aug 4, 2018
@yesbox yesbox deleted the netdata branch September 22, 2018 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yesbox @xeji @GrahamcOfBorg