git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/netdata: cgroup-network: don't use AmbientCapabilities
commit58497175be8c3046186127064ec14fc62191282d authorIzorkin <izorkin@elven.pw> dateMon 10 May 2021, 09:57 (6 years ago) parent9622485
2 files changed+14−3
nixos/modules/services/monitoring/netdata.nix+12−3 pkgs/tools/system/netdata/default.nix+2
nixos/modules/services/monitoring/netdata.nix+12−3
@@ -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,9 @@ 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+ };
2933 };
3034 mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config);
3135 configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig);
@@ -183,9 +187,6 @@ in {
183187 ConfigurationDirectory = "netdata";
184188 ConfigurationDirectoryMode = "0755";
185189 # Capabilities
186− AmbientCapabilities = [
187− "CAP_SETUID" # is required for cgroups and cgroups-network plugins
188− ];
189190 CapabilityBoundingSet = [
190191 "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
191192 "CAP_DAC_READ_SEARCH" # is required for apps plugin
@@ -217,6 +218,14 @@ in {
217218 permissions = "u+rx,g+rx,o-rwx";
218219 };
219220
221+ security.wrappers."cgroup-network" = {
222+ source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
223+ capabilities = "cap_setuid+ep";
224+ owner = cfg.user;
225+ group = cfg.group;
226+ permissions = "u+rx,g+rx,o-rwx";
227+ };
228+
220229 security.wrappers."freeipmi.plugin" = {
221230 source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
222231 capabilities = "cap_dac_override,cap_fowner+ep";
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 \