Factorize smartd monitoring

diff --git a/deploy/flake.lock b/deploy/flake.lock
index d1eba4ce3be542328aae1aa24607f382929e7d1b..6242197924b7bf90f7acfdf493253908b284881f 100644 (file)
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-W4TIMgSVOiYTGt6hXrMNVxrJ9QZaQrL+awvGLk2UXjU=",
+        "narHash": "sha256-bmglD7CvrNkfOtMTTLlDAGhmY4YPcZD3Qrxv0CBk5B8=",
         "path": "../flakes",
         "type": "path"
       },
@@ -2894,7 +2894,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2912,7 +2912,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2930,7 +2930,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2948,7 +2948,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -3832,7 +3832,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-KL5aC6l/mM+ucHadjCtlSY6iBZ9/VKRf2Rgw2tjwfqo=",
+        "narHash": "sha256-90nIfmXTv1DCJThIjtlNtnkMxefYJMHLp0CHmIekgDc=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3855,7 +3855,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-VliQ62boc8jNgPCBX6JjVS/pA6YoikZVkvE1xxHAITk=",
+        "narHash": "sha256-kUhSjG2OtbZMeIEykJGKUC2RovZ1prxXc8aIckE0auI=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3903,7 +3903,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YVJi4KPT8rsGNzZshYfUyz9l27QGAEsb8Iyu3O0/bMA=",
+        "narHash": "sha256-20vFVAd2/24Q0Lewy0eNXf94eTY96cFE8mPeKtvT5jY=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3929,7 +3929,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-HiDwzScPHp084MwtWET+17WbrWf3zs9qJzv/EqNaSqM=",
+        "narHash": "sha256-BHpsgdt0NuJHTVvfTrsnNlOZdSBtPy/cTidd8sEIhx4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3954,7 +3954,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YWEuXALLICHE+WsMtMuiCm6b2IRQyJrFpfMgH6ZLD0A=",
+        "narHash": "sha256-lT2cXjUGDFOzRtqF4p0oyFCR4gv+VEjthk4FMbOzrL0=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7541,7 +7541,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -8412,7 +8412,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "./private/monitoring",
         "type": "path"
       },
@@ -8888,11 +8888,11 @@
         "nixpkgs": "nixpkgs_106"
       },
       "locked": {
-        "lastModified": 1713004475,
-        "narHash": "sha256-zXj5DiaeAiLGIFcgMyQTtICXg4kgIiiYcTbnDIocY38=",
+        "lastModified": 1718015850,
+        "narHash": "sha256-svUAfD+aIaS9T9UtepEGlIdxcZyu3YJcrGOmjuwgplE=",
         "ref": "master",
-        "rev": "8fd3e35df106a494e3195708e8cba076f2c94acb",
-        "revCount": 728,
+        "rev": "71fbb32c4b3195982c0f03c90714c959b5ce2251",
+        "revCount": 735,
         "type": "git",
         "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
       },

diff --git a/flake.lock b/flake.lock
index 5485356215989198b7989d96b9d7f6dbd7af56df..260f1e4f5f2e4f36f8000127b1487322c9753f80 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-W4TIMgSVOiYTGt6hXrMNVxrJ9QZaQrL+awvGLk2UXjU=",
+        "narHash": "sha256-bmglD7CvrNkfOtMTTLlDAGhmY4YPcZD3Qrxv0CBk5B8=",
         "path": "./flakes",
         "type": "path"
       },
@@ -2910,7 +2910,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2928,7 +2928,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2946,7 +2946,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2964,7 +2964,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -3848,7 +3848,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-KL5aC6l/mM+ucHadjCtlSY6iBZ9/VKRf2Rgw2tjwfqo=",
+        "narHash": "sha256-90nIfmXTv1DCJThIjtlNtnkMxefYJMHLp0CHmIekgDc=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3871,7 +3871,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-VliQ62boc8jNgPCBX6JjVS/pA6YoikZVkvE1xxHAITk=",
+        "narHash": "sha256-kUhSjG2OtbZMeIEykJGKUC2RovZ1prxXc8aIckE0auI=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3919,7 +3919,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YVJi4KPT8rsGNzZshYfUyz9l27QGAEsb8Iyu3O0/bMA=",
+        "narHash": "sha256-20vFVAd2/24Q0Lewy0eNXf94eTY96cFE8mPeKtvT5jY=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3945,7 +3945,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-HiDwzScPHp084MwtWET+17WbrWf3zs9qJzv/EqNaSqM=",
+        "narHash": "sha256-BHpsgdt0NuJHTVvfTrsnNlOZdSBtPy/cTidd8sEIhx4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3970,7 +3970,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YWEuXALLICHE+WsMtMuiCm6b2IRQyJrFpfMgH6ZLD0A=",
+        "narHash": "sha256-lT2cXjUGDFOzRtqF4p0oyFCR4gv+VEjthk4FMbOzrL0=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7557,7 +7557,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -8428,7 +8428,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "./private/monitoring",
         "type": "path"
       },

diff --git a/flakes/flake.lock b/flakes/flake.lock
index 85690faa9ca81d06d94a4784ee147cdd0da5c8b7..991a73b4a05a81508f13e3747880ddd44887c16f 100644 (file)
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -2815,7 +2815,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2833,7 +2833,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2851,7 +2851,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -2869,7 +2869,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -3753,7 +3753,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-KL5aC6l/mM+ucHadjCtlSY6iBZ9/VKRf2Rgw2tjwfqo=",
+        "narHash": "sha256-90nIfmXTv1DCJThIjtlNtnkMxefYJMHLp0CHmIekgDc=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3776,7 +3776,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-VliQ62boc8jNgPCBX6JjVS/pA6YoikZVkvE1xxHAITk=",
+        "narHash": "sha256-kUhSjG2OtbZMeIEykJGKUC2RovZ1prxXc8aIckE0auI=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3824,7 +3824,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YVJi4KPT8rsGNzZshYfUyz9l27QGAEsb8Iyu3O0/bMA=",
+        "narHash": "sha256-20vFVAd2/24Q0Lewy0eNXf94eTY96cFE8mPeKtvT5jY=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3850,7 +3850,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-HiDwzScPHp084MwtWET+17WbrWf3zs9qJzv/EqNaSqM=",
+        "narHash": "sha256-BHpsgdt0NuJHTVvfTrsnNlOZdSBtPy/cTidd8sEIhx4=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3875,7 +3875,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-YWEuXALLICHE+WsMtMuiCm6b2IRQyJrFpfMgH6ZLD0A=",
+        "narHash": "sha256-lT2cXjUGDFOzRtqF4p0oyFCR4gv+VEjthk4FMbOzrL0=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7384,7 +7384,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },
@@ -8294,7 +8294,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "./private/monitoring",
         "type": "path"
       },

diff --git a/flakes/private/monitoring/flake.nix b/flakes/private/monitoring/flake.nix
index b7c3997dd9b10467fbc8f1d6249e43d2897ca32a..5610d6789145104eb21219053f4812987f3cf629 100644 (file)
--- a/flakes/private/monitoring/flake.nix
+++ b/flakes/private/monitoring/flake.nix
@@ -164,6 +164,13 @@
                 Whether to enable monitoring.
               '';
             };
+            smartdDisks = lib.mkOption {
+              type = lib.types.listOf lib.types.str;
+              default = [];
+              description = ''
+                List of smartd disks ids (symlinks in /dev/disk/by-id/) to monitor
+              '';
+            };
             master = lib.mkOption {
               type = lib.types.bool;
               default = false;
@@ -261,6 +268,54 @@
             objectDefs =
               self.lib.toObjects cfg.objects;
           };
+
+          myServices.monitoring.objects.service = builtins.map (d: {
+            service_description = "Disk /dev/disk/by-id/${d} is sane";
+            use = "local-service";
+            check_command = [ "check_smartctl" "/dev/disk/by-id/${d}" ];
+            __passive_servicegroups = "webstatus-resources";
+
+            check_interval = 60;
+          }) cfg.smartdDisks;
+
+          systemd = let
+            checkShortTimer = {
+              timerConfig = {
+                OnCalendar = "monthly";
+                RandomizedDelaySec = "3 weeks";
+                FixedRandomDelay = true;
+              };
+              wantedBy = [ "timers.target" ];
+            };
+            checkLongTimer = {
+              timerConfig = {
+                OnCalendar = "monthly";
+                RandomizedDelaySec = "3 weeks";
+                FixedRandomDelay = true;
+              };
+              wantedBy = [ "timers.target" ];
+            };
+            toSDTimers = id: {
+              "check-smartd-long-${id}" = checkLongTimer;
+              "check-smartd-short-${id}" = checkShortTimer;
+            };
+            toCheckService = id: type: {
+              description = "Run ${type} smartctl test for /dev/disk/by-id/${id}";
+              after = [ "multi-user.target" ];
+              serviceConfig = {
+                Type = "oneshot";
+                ExecStart = "${pkgs.smartmontools}/bin/smartctl -t ${type} /dev/disk/by-id/${id}";
+              };
+            };
+            toSDServices = id: {
+              "check-smartd-long-${id}" = toCheckService id "long";
+              "check-smartd-short-${id}" = toCheckService id "short";
+            };
+
+          in {
+            services = lib.attrsets.mergeAttrsList (builtins.map toSDServices cfg.smartdDisks);
+            timers = lib.attrsets.mergeAttrsList (builtins.map toSDTimers cfg.smartdDisks);
+          };
         };
       };
   };

diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock
index d6e56a5d4bf6f5bd9ff0215748ca57644b5cd595..7d5992ee6dcf13eac1074cee742678cb5480c8d5 100644 (file)
--- a/systems/backup-2/flake.lock
+++ b/systems/backup-2/flake.lock
@@ -389,7 +389,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },

diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock
index a690504e103a44fbc018eac9580c4eae51f9733c..ce8bb8f9e82af08c44f997512b1700c39acae4e5 100644 (file)
--- a/systems/dilion/flake.lock
+++ b/systems/dilion/flake.lock
@@ -207,7 +207,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },

diff --git a/systems/dilion/monitoring.nix b/systems/dilion/monitoring.nix
index 5c4e5b0853d67c5570120f23e70e37403ae6bee8..e45aa25acee4771a27ac4d5147b896151ee7d04f 100644 (file)
--- a/systems/dilion/monitoring.nix
+++ b/systems/dilion/monitoring.nix
@@ -9,6 +9,12 @@ let
   };
 in
 {
+  config.myServices.monitoring.smartdDisks = [
+    "ata-Micron_1100_MTFDDAK512TBN_171216BD2A4B"
+    "ata-Micron_1100_MTFDDAK512TBN_171216BD2A70"
+    "ata-TOSHIBA_MG04ACA400N_96K1K87YFVLC"
+    "ata-WDC_WD3000FYYZ-01UL1B2_WD-WMC1F0E4X6WP"
+  ];
   config.myServices.monitoring.activatedPlugins = [ "memory" "command" "bandwidth" "mdadm" "zfs" "notify-secondary" "smartctl" ];
   config.myServices.monitoring.objects = lib.mkMerge [
     (monitoring.lib.objectsCommon {
@@ -22,38 +28,6 @@ in
 
     {
       service = [
-        {
-          service_description = "Disk /dev/disk/by-id/ata-Micron_1100_MTFDDAK512TBN_171216BD2A4B is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-Micron_1100_MTFDDAK512TBN_171216BD2A4B" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-Micron_1100_MTFDDAK512TBN_171216BD2A70 is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-Micron_1100_MTFDDAK512TBN_171216BD2A70" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-TOSHIBA_MG04ACA400N_96K1K87YFVLC is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-TOSHIBA_MG04ACA400N_96K1K87YFVLC" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-WDC_WD3000FYYZ-01UL1B2_WD-WMC1F0E4X6WP is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-WDC_WD3000FYYZ-01UL1B2_WD-WMC1F0E4X6WP" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
         {
           service_description = "No mdadm array is degraded";
           use = "local-service";

diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 461bebb2c990bb360a3c4e81cd8f87021443d2d5..27d4d5bfef13d27e8fe5c180ea6164e8cc9c3357 100644 (file)
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -2038,7 +2038,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },

diff --git a/systems/eldiron/monitoring.nix b/systems/eldiron/monitoring.nix
index 92da7cf1340a816766277a22df44c05e1c1c04a1..f3b9aeb11f40c751b15cf3b61592d46f82b6b4f2 100644 (file)
--- a/systems/eldiron/monitoring.nix
+++ b/systems/eldiron/monitoring.nix
@@ -4,6 +4,12 @@ let
   emailCheck = monitoring.lib.emailCheck config.myEnv.monitoring.email_check;
 in
 {
+  config.myServices.monitoring.smartdDisks = [
+    "ata-ST33000650NS_Z29540DM"
+    "ata-ST33000650NS_Z296JGJ4"
+    "ata-Micron_5200_MTFDDAK480TDC_18011BEE03B3"
+  ];
+
   config.myServices.monitoring.activatedPlugins = [ "memory" "command" "bandwidth" "emails" "mdadm" "postfix" "postgresql" "zfs" "notify-secondary" "smartctl" ];
   config.myServices.monitoring.pluginsArgs.postgresql.package = config.myServices.databases.postgresql.package;
   config.myServices.monitoring.objects = lib.mkMerge [
@@ -18,38 +24,6 @@ in
 
     {
       service = [
-        {
-          service_description = "Disk /dev/disk/by-id/ata-ST33000650NS_Z29540DM is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-ST33000650NS_Z29540DM" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-ST33000650NS_Z296JGJ4 is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-ST33000650NS_Z296JGJ4" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-SAMSUNG_MZ7LM480HMHQ-00005_S2UJNX0HA05895 is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-SAMSUNG_MZ7LM480HMHQ-00005_S2UJNX0HA05895" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
-        {
-          service_description = "Disk /dev/disk/by-id/ata-Micron_5200_MTFDDAK480TDC_18011BEE03B3 is sane";
-          use = "local-service";
-          check_command = [ "check_smartctl" "/dev/disk/by-id/ata-Micron_5200_MTFDDAK480TDC_18011BEE03B3" ];
-          __passive_servicegroups = "webstatus-resources";
-
-          check_interval = 60;
-        }
         {
           service_description = "No mdadm array is degraded";
           use = "local-service";

diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index 643683a2678c16ce6a70f41820423bca4f35ce76..c69d09adf1b4bce593481cc43e8e9a08435f0c87 100644 (file)
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -277,7 +277,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },

diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index afb007be48cdb270c9eac9fca1f57b67620ae997..4cb49daabac935b7b869869d2329dff9bab62ccc 100644 (file)
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -239,7 +239,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-A50vXg0qfzUhyQZKToEseYsLgtaYke41KE/4uuyj+PY=",
+        "narHash": "sha256-Lpe56lKWhlMQiQoCgvMJuqJtJ8+szDldjqMAGyt2U3U=",
         "path": "../../flakes/private/monitoring",
         "type": "path"
       },