about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-05-06 14:58:33 +0100
committerGitHub <noreply@github.com>2021-05-06 14:58:33 +0100
commit4e783a4cb75a8c0626964ad13f5e79f2d757c071 (patch)
treee1af12586cd54a8593ad3ce1d184611bcbb55b01 /nixos
parentb418e17a4ccf42b1a99aa6eca2b86a5b552d081a (diff)
parent6b2462aec9ac7a17ba553aa21f868eecf6e0e615 (diff)
downloadnixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar.gz
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar.bz2
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar.lz
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar.xz
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.tar.zst
nixlib-4e783a4cb75a8c0626964ad13f5e79f2d757c071.zip
Merge pull request #121724 from Izorkin/update-netdata
netdata: 1.29.3 -> 1.30.1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/monitoring/netdata.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 007024c04ce5..c2ee1c0df7f1 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -149,8 +149,9 @@ in {
       description = "Real time performance monitoring";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable
-        (pkgs.python3.withPackages cfg.python.extraPackages);
+      path = (with pkgs; [ curl gawk iproute2 which ])
+        ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages)
+        ++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package);
       environment = {
         PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules";
       } // lib.optionalAttrs (!cfg.enableAnalyticsReporting) {
@@ -182,6 +183,9 @@ in {
         ConfigurationDirectory = "netdata";
         ConfigurationDirectoryMode = "0755";
         # Capabilities
+        AmbientCapabilities = [
+          "CAP_SETUID"            # is required for cgroups and cgroups-network plugins
+        ];
         CapabilityBoundingSet = [
           "CAP_DAC_OVERRIDE"      # is required for freeipmi and slabinfo plugins
           "CAP_DAC_READ_SEARCH"   # is required for apps plugin
@@ -191,6 +195,8 @@ in {
           "CAP_SYS_PTRACE"        # is required for apps plugin
           "CAP_SYS_RESOURCE"      # is required for ebpf plugin
           "CAP_NET_RAW"           # is required for fping app
+          "CAP_SYS_CHROOT"        # is required for cgroups plugin
+          "CAP_SETUID"            # is required for cgroups and cgroups-network plugins
         ];
         # Sandboxing
         ProtectSystem = "full";