1 files changed, 28 insertions, 16 deletions

diff --git a/flakes/private/monitoring/myplugins.nix b/flakes/private/monitoring/myplugins.nix
index eb2fbd1..ca47b71 100644
--- a/flakes/private/monitoring/myplugins.nix
+++ b/flakes/private/monitoring/myplugins.nix
@@ -248,20 +248,19 @@ in
   };
   megaraid = let
     megacli = pkgs.megacli.overrideAttrs(old: { meta = old.meta // { license = null; }; });
+    rawPlugin = pkgs.fetchurl {
+      name = "check_megaraid_sas";
+      url = "https://exchange.nagios.org/components/com_mtree/attachment.php?link_id=6381&cf_id=24";
+      sha256 = "0yf60p4c0hb4q3fng9fc14qc89bqm0f1sijayzygadaqcl44jx4p";
+    };
   in {
     commands = {
       check_megaraid = "$USER2$/check_megaraid_sas --sudo";
     };
     chunk = let
-      megaCliPlugin = pkgs.runCommand "megaCliPlugin" {
-        plugin = pkgs.fetchurl {
-          name = "check_megaraid_sas";
-          url = "https://exchange.nagios.org/components/com_mtree/attachment.php?link_id=6381&cf_id=24";
-          sha256 = "0yf60p4c0hb4q3fng9fc14qc89bqm0f1sijayzygadaqcl44jx4p";
-        };
-      } ''
+      megaCliPlugin = pkgs.runCommand "megaCliPlugin" {} ''
         mkdir $out
-        cp $plugin $out/check_megaraid_sas
+        cp ${rawPlugin} $out/check_megaraid_sas
         chmod +x $out/check_megaraid_sas
         patchShebangs $out
         substituteInPlace $out/check_megaraid_sas --replace /usr/sbin/MegaCli ${megacli}/bin/MegaCli64
@@ -278,6 +277,13 @@ in
       ];
       runAs = "root";
     };
+    debianScript = "${pkgs.runCommand "megacli-plugin" {} ''
+      mkdir $out
+      cp ${rawPlugin} $out/check_megaraid_sas
+      chmod +wx $out/check_megaraid_sas
+      sed -i -e 's@/usr/sbin/MegaCli@/usr/sbin/megacli@' $out/check_megaraid_sas
+    ''}/check_megaraid_sas";
+    debianPackages = [ "perl" ];
   };
   memory = {
     commands = {
@@ -293,16 +299,16 @@ in
     debianScript = "${./plugins}/check_mem.sh";
     debianPackages = [ "grep" "mawk" "procps" ];
   };
-  smartctl = {
+  smartctl = let
+    smartPlugin = pkgs.fetchurl {
+      url = "https://www.claudiokuenzler.com/monitoring-plugins/check_smart.pl";
+      sha256 = "sha256-gxGkzyycUl+I3WziKhOnZSoQjpqbPqjbunfUQxmeb7w=";
+    };
+  in {
     commands = {
-      check_smartctl = "$USER2$/check_smartctl -i auto -d $ARG1$";
+      check_smartctl = "$USER2$/check_smartctl -s -i auto -d $ARG1$";
     };
-    chunk = let
-      smartPlugin = pkgs.fetchurl {
-        url = "https://www.claudiokuenzler.com/monitoring-plugins/check_smart.pl";
-        sha256 = "sha256-gxGkzyycUl+I3WziKhOnZSoQjpqbPqjbunfUQxmeb7w=";
-      };
-    in ''
+    chunk = ''
       cp ${smartPlugin} $out/check_smartctl
       chmod +x $out/check_smartctl
       patchShebangs $out
@@ -316,6 +322,12 @@ in
       ];
       runAs = "root";
     };
+    debianScript = "${pkgs.runCommand "smart-plugin" {} ''
+      mkdir $out
+      cp ${smartPlugin} $out/check_smart.pl
+      chmod +x $out/check_smart.pl
+    ''}/check_smart.pl";
+    debianPackages = [ "perl" ];
   };
   mysql = {
     commands = {