From 3282b7d6340f555e9b0bfb93ae1b2146dc394f02 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Sat, 29 Nov 2025 22:42:00 +0100
Subject: [PATCH] fix: monitoring

---
 hosts/fw/configuration.nix            | 2 +-
 hosts/nas/configuration.nix           | 3 ++-
 hosts/nas/modules/disk-monitoring.nix | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix
index 543f492..6a41e33 100644
--- a/hosts/fw/configuration.nix
+++ b/hosts/fw/configuration.nix
@@ -7,6 +7,7 @@
     ./utils/modules/nginx.nix
 
     ./utils/modules/autoupgrade.nix
+    ./utils/modules/victoriametrics
     ./utils/modules/promtail
     ./utils/modules/borgbackup.nix
 
@@ -25,7 +26,6 @@
     ./modules/podman.nix
     ./modules/omada.nix
     ./modules/ddclient.nix
-    ./utils/modules/victoriametrics
     # ./modules/wol.nix
 
 
diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix
index 4091bd5..71b7040 100644
--- a/hosts/nas/configuration.nix
+++ b/hosts/nas/configuration.nix
@@ -9,7 +9,8 @@ in {
     "${impermanence}/nixos.nix"
     ./utils/bento.nix
     ./utils/modules/sops.nix
-    ./utils/modules/victoriametrics/default.nix
+    ./utils/modules/victoriametrics
+    ./utils/modules/promtail
 
     ./modules/pyload.nix
     ./modules/jellyfin.nix
diff --git a/hosts/nas/modules/disk-monitoring.nix b/hosts/nas/modules/disk-monitoring.nix
index da42bcb..9316941 100644
--- a/hosts/nas/modules/disk-monitoring.nix
+++ b/hosts/nas/modules/disk-monitoring.nix
@@ -104,7 +104,7 @@ EOF
 
     # mdadm RAID array status (doesn't access disks)
     echo "" >> "$TEMP_FILE"
-    echo "# HELP mdadm_array_state RAID array state (1=clean, 0=degraded/other)" >> "$TEMP_FILE"
+    echo "# HELP mdadm_array_state RAID array state (1=clean/active/resyncing, 0=degraded/other)" >> "$TEMP_FILE"
     echo "# TYPE mdadm_array_state gauge" >> "$TEMP_FILE"
     echo "# HELP mdadm_array_devices_total Total devices in RAID array" >> "$TEMP_FILE"
     echo "# TYPE mdadm_array_devices_total gauge" >> "$TEMP_FILE"
@@ -122,7 +122,7 @@ EOF
 
       # Parse state
       state=$(echo "$mdadm_output" | grep "State :" | sed 's/.*State : //' | tr -d ' ')
-      if [[ "$state" == "clean" ]] || [[ "$state" == "active" ]]; then
+      if [[ "$state" == *clean* ]] || [[ "$state" == *active* ]]; then
         state_value=1
       else
         state_value=0
@@ -156,7 +156,6 @@ in
     enable = true;
     enabledCollectors = [
       "textfile"
-      "systemd"
     ];
     extraFlags = [
       "--collector.textfile.directory=${textfileDir}"