about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-10-12 09:57:45 +0100
committerMario Rodas <marsam@users.noreply.github.com>2018-11-16 11:24:27 -0500
commit348b7b8be9eff6e16642e659f24c743520b68bac (patch)
tree2e49b49b811cc6526adc123c5fb726cbb1f15018
parentd417ca7ba9b53cfe692f5ffa61daf88fc8d32785 (diff)
downloadnixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar.gz
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar.bz2
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar.lz
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar.xz
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.tar.zst
nixlib-348b7b8be9eff6e16642e659f24c743520b68bac.zip
nixos/netdata: own plugins must the looked up first
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.
-rw-r--r--nixos/modules/services/monitoring/netdata.nix4
-rw-r--r--pkgs/tools/system/netdata/default.nix6
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index edcaa10d969d..7f21beeb1331 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -12,7 +12,7 @@ let
 
   localConfig = {
     global = {
-      "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d";
+      "plugins directory" = "${pkgs.netdata}/libexec/netdata/plugins.d ${wrappedPlugins}/libexec/netdata/plugins.d";
     };
     web = {
       "web files owner" = "root";
@@ -96,7 +96,7 @@ in {
     };
 
     security.wrappers."apps.plugin" = {
-      source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin";
+      source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org";
       capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
       owner = cfg.user;
       group = cfg.group;
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 03249cce82bc..97a250f79d89 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec{
     ./no-files-in-etc-and-var.patch
   ];
 
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    # rename this plugin so netdata will look for setuid wrapper
+    mv $out/libexec/netdata/plugins.d/apps.plugin \
+      $out/libexec/netdata/plugins.d/apps.plugin.org
+  '';
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"