git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122423 from Izorkin/update-netdata

nixos/netdata: update configuration

commit8af4bf61fdd04e8ae7ba51898fc544221614ecbb authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 11 May 2021, 06:07 (6 years ago) parentf93d83d85914bc
2 files changed+19−7
nixos/modules/services/monitoring/netdata.nix+17−7 pkgs/tools/system/netdata/default.nix+2
nixos/modules/services/monitoring/netdata.nix+17−7
@@ -8,6 +8,7 @@ let
88 wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } ''
99 mkdir -p $out/libexec/netdata/plugins.d
1010 ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
11+ ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network
1112 ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
1213 ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
1314 ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
@@ -26,6 +27,10 @@ let
2627 "web files owner" = "root";
2728 "web files group" = "root";
2829 };
30+ "plugin:cgroups" = {
31+ "script to get cgroup network interfaces" = "${wrappedPlugins}/libexec/netdata/plugins.d/cgroup-network";
32+ "use unified cgroups" = "yes";
33+ };
2934 };
3035 mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config);
3136 configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig);
@@ -183,9 +188,6 @@ in {
183188 ConfigurationDirectory = "netdata";
184189 ConfigurationDirectoryMode = "0755";
185190 # Capabilities
186− AmbientCapabilities = [
187− "CAP_SETUID" # is required for cgroups and cgroups-network plugins
188− ];
189191 CapabilityBoundingSet = [
190192 "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
191193 "CAP_DAC_READ_SEARCH" # is required for apps plugin
@@ -214,7 +216,15 @@ in {
214216 capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
215217 owner = cfg.user;
216218 group = cfg.group;
217− permissions = "u+rx,g+rx,o-rwx";
219+ permissions = "u+rx,g+x,o-rwx";
220+ };
221+
222+ security.wrappers."cgroup-network" = {
223+ source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
224+ capabilities = "cap_setuid+ep";
225+ owner = cfg.user;
226+ group = cfg.group;
227+ permissions = "u+rx,g+x,o-rwx";
218228 };
219229
220230 security.wrappers."freeipmi.plugin" = {
@@ -222,7 +232,7 @@ in {
222232 capabilities = "cap_dac_override,cap_fowner+ep";
223233 owner = cfg.user;
224234 group = cfg.group;
225− permissions = "u+rx,g+rx,o-rwx";
235+ permissions = "u+rx,g+x,o-rwx";
226236 };
227237
228238 security.wrappers."perf.plugin" = {
@@ -230,7 +240,7 @@ in {
230240 capabilities = "cap_sys_admin+ep";
231241 owner = cfg.user;
232242 group = cfg.group;
233− permissions = "u+rx,g+rx,o-rx";
243+ permissions = "u+rx,g+x,o-rwx";
234244 };
235245
236246 security.wrappers."slabinfo.plugin" = {
@@ -238,7 +248,7 @@ in {
238248 capabilities = "cap_dac_override+ep";
239249 owner = cfg.user;
240250 group = cfg.group;
241− permissions = "u+rx,g+rx,o-rx";
251+ permissions = "u+rx,g+x,o-rwx";
242252 };
243253
244254 security.pam.loginLimits = [
pkgs/tools/system/netdata/default.nix+2
@@ -56,6 +56,8 @@ in stdenv.mkDerivation rec {
5656 # rename this plugin so netdata will look for setuid wrapper
5757 mv $out/libexec/netdata/plugins.d/apps.plugin \
5858 $out/libexec/netdata/plugins.d/apps.plugin.org
59+ mv $out/libexec/netdata/plugins.d/cgroup-network \
60+ $out/libexec/netdata/plugins.d/cgroup-network.org
5961 mv $out/libexec/netdata/plugins.d/perf.plugin \
6062 $out/libexec/netdata/plugins.d/perf.plugin.org
6163 mv $out/libexec/netdata/plugins.d/slabinfo.plugin \