From 8e3a5b0ff3f0660729d8e964ee56602befd272ae Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 8 Nov 2024 11:19:59 +0100
Subject: [PATCH] monitoring: remove postfix

---
 modules/monitoring/default.nix | 15 ---------------
 overlays/default.nix           | 12 ------------
 2 files changed, 27 deletions(-)

diff --git a/modules/monitoring/default.nix b/modules/monitoring/default.nix
index 3166ba4..5f27ee6 100644
--- a/modules/monitoring/default.nix
+++ b/modules/monitoring/default.nix
@@ -37,12 +37,8 @@ in
         token_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/token";
         api_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/userinfo";
         role_attribute_path = "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'";
-
       };
-
     };
-
-
   };
 
   services.postgresql = {
@@ -65,10 +61,6 @@ in
         enabledCollectors = [ "systemd" ];
         port = 9002;
       };
-      postfix = {
-        enable = true;
-        port = 9003;
-      };
     };
     scrapeConfigs = [
       {
@@ -78,13 +70,6 @@ in
         }];
         scrape_interval = "15s";
       }
-      {
-        job_name = "postfix";
-        static_configs = [{
-          targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.postfix.port}" ];
-        }];
-        # scrape_interval = "60s";
-      }
       {
         job_name = "rspamd";
         static_configs = [{
diff --git a/overlays/default.nix b/overlays/default.nix
index 9ee0bf2..5169a10 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,18 +12,6 @@ in
       sha256 = "sha256-3w+FJezbo4DnS1N8pxrfO3WWWT8CGJtZqw6//IXMyN4=";
     };
   }));
-  # (hopefully) fix systemd journal reading
-  # prometheus-postfix-exporter = prev.prometheus-postfix-exporter.overrideAttrs (_old: {
-  #   patches = [
-  #     ./prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch
-  #   ];
-  #   src = fetchFromGitHub {
-  #     owner = "adangel";
-  #     repo = "postfix_exporter";
-  #     rev = "414ac12ee63415eede46cb3084d755a6da6fba23";
-  #     hash = "sha256-m1kVaO3N7XC1vtnxXX9kMiEFPmZuoopRUYgA7gQzP8w=";
-  #   };
-  # });
   # Mailman internal server error fix
   # https://gitlab.com/mailman/mailman/-/issues/1137
   # https://github.com/NixOS/nixpkgs/pull/321136