From 7fc3c3db631ad0dc5d35a92dc1665fc6701cbd46 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Sat, 31 May 2025 19:21:56 +0200
Subject: [PATCH] feat: add VictoriaMetrics module, update Dovecot Sieve
 extensions, and fix Grafana service expression

---
 hosts/fw/configuration.nix                                    | 3 ++-
 hosts/mail/modules/dovecot.nix                                | 3 +++
 .../web-arm/modules/grafana/alerting/service/service_down.nix | 4 ++--
 utils/modules/victoriametrics/default.nix                     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hosts/fw/configuration.nix b/hosts/fw/configuration.nix
index fc47be8..930d428 100644
--- a/hosts/fw/configuration.nix
+++ b/hosts/fw/configuration.nix
@@ -26,6 +26,7 @@
     ./modules/podman.nix
     ./modules/omada.nix
     ./modules/ddclient.nix
+    ./utils/modules/victoriametrics
     # ./modules/wol.nix
 
 
@@ -42,7 +43,7 @@
 
     # git
     ./modules/gitea.nix
-    ./modules/fwmetrics.nix
+    # ./modules/fwmetrics.nix
 
     # ha customers
     ./modules/ha-customers
diff --git a/hosts/mail/modules/dovecot.nix b/hosts/mail/modules/dovecot.nix
index cf8e8c1..90ba13c 100644
--- a/hosts/mail/modules/dovecot.nix
+++ b/hosts/mail/modules/dovecot.nix
@@ -99,6 +99,9 @@ in
     mailLocation = "maildir:/var/vmail/%d/%n/Maildir";
     mailUser = "vmail";
     mailGroup = "vmail";
+
+    sieve.extensions = [ "copy" "editheader" "relational" "reject" "fileinto" "imap4flags" "vacation-seconds" ];
+
     extraConfig = ''
       ssl = yes
       ssl_cert = </var/lib/acme/imap.${domain}/fullchain.pem
diff --git a/hosts/web-arm/modules/grafana/alerting/service/service_down.nix b/hosts/web-arm/modules/grafana/alerting/service/service_down.nix
index 51ee67f..8ca3c36 100644
--- a/hosts/web-arm/modules/grafana/alerting/service/service_down.nix
+++ b/hosts/web-arm/modules/grafana/alerting/service/service_down.nix
@@ -68,7 +68,7 @@
           datasourceUid = "vm-datasource-uid";
           model = {
             editorMode = "code";
-            expr = "node_systemd_unit_state{state=\"active\", name=\"microvm@git-runner-1.service \"} OR on() vector(0)";
+            expr = "node_systemd_unit_state{state=\"active\", name=\"microvm@git-runner-1.service\"} OR on() vector(0)";
             hide = false;
             intervalMs = 1000;
             legendFormat = "__auto";
@@ -315,4 +315,4 @@
       };
     }
   ];
-}
\ No newline at end of file
+}
diff --git a/utils/modules/victoriametrics/default.nix b/utils/modules/victoriametrics/default.nix
index d07c000..fd14825 100644
--- a/utils/modules/victoriametrics/default.nix
+++ b/utils/modules/victoriametrics/default.nix
@@ -26,7 +26,7 @@ let
           regex: 'node_systemd_unit_state'
           action: keep
         - source_labels: [name]
-          regex: '(container@git|microvm@git-runner-1|postfix|dovecot|openldap|wireguard-wg_cloonar).*\.service'
+          regex: '(container@git|microvm@git-runner-|postfix|dovecot|openldap|wireguard-wg_cloonar).*\.service'
           action: keep
   '';
 in {