grafana: init

overlays/default.nix

@@ -63,80 +63,92 @@ in
   adguardian-term = callPackage ../pkgs/adguardian-term { };
 
   # upstream package is broken and can't be fixed by overriding attrs. so I just completely redo it in here
-  seahub = (python3Packages.buildPythonApplication
-    rec {
-      pname = "seahub";
-      version = "11.0.1";
-      format = "other";
-      src = fetchFromGitHub {
-        owner = "haiwen";
-        repo = "seahub";
-        rev = "v11.0.1-pro";
-        sha256 = "sha256-dxMvbiAdECMZIf+HgA5P2gZYI9l+k+nhmdzfg90037A=";
-      };
+  seahub = (python3Packages.buildPythonApplication rec {
+    pname = "seahub";
+    version = "11.0.1";
+    format = "other";
+    src = fetchFromGitHub {
+      owner = "haiwen";
+      repo = "seahub";
+      rev = "v11.0.1-pro";
+      sha256 = "sha256-dxMvbiAdECMZIf+HgA5P2gZYI9l+k+nhmdzfg90037A=";
+    };
 
 
-      dontBuild = true;
+    dontBuild = true;
 
-      doCheck = false; # disabled because it requires a ccnet environment
+    doCheck = false; # disabled because it requires a ccnet environment
 
-      nativeBuildInputs = [
-        makeWrapper
-      ];
+    nativeBuildInputs = [
+      makeWrapper
+    ];
 
-      propagatedBuildInputs = with python3Packages; [
-        django
-        future
-        django-compressor
-        django-statici18n
-        django-webpack-loader
-        django-simple-captcha
-        django-picklefield
-        django-formtools
-        mysqlclient
-        pillow
-        python-dateutil
-        djangorestframework
-        openpyxl
-        requests
-        requests-oauthlib
-        chardet
-        pyjwt
-        pycryptodome
-        qrcode
-        pysearpc
-        seaserv
-        gunicorn
-        markdown
-        bleach
-        python-ldap
-        pyopenssl
-        (buildPythonPackage rec {
-          pname = "djangosaml2";
-          version = "1.7.0";
-          doCheck = false;
-          propagatedBuildInputs = [
-            pysaml2
-            django
-            defusedxml
-          ];
-          src = fetchPypi {
-            inherit pname version;
-            sha256 = "sha256-WiMl2UvbOskLA5o5LXPrBF2VktlDnlBNdc42eZ62Fko=";
-          };
-        })
-      ];
+    propagatedBuildInputs = with python3Packages; [
+      django
+      future
+      django-compressor
+      django-statici18n
+      django-webpack-loader
+      django-simple-captcha
+      django-picklefield
+      django-formtools
+      mysqlclient
+      pillow
+      python-dateutil
+      djangorestframework
+      openpyxl
+      requests
+      requests-oauthlib
+      chardet
+      pyjwt
+      pycryptodome
+      qrcode
+      pysearpc
+      seaserv
+      gunicorn
+      markdown
+      bleach
+      python-ldap
+      pyopenssl
+      (buildPythonPackage rec {
+        pname = "djangosaml2";
+        version = "1.7.0";
+        doCheck = false;
+        propagatedBuildInputs = [
+          pysaml2
+          django
+          defusedxml
+        ];
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "sha256-WiMl2UvbOskLA5o5LXPrBF2VktlDnlBNdc42eZ62Fko=";
+        };
+      })
+    ];
 
-      installPhase = ''
-        cp -dr --no-preserve='ownership' . $out/
-        wrapProgram $out/manage.py \
-          --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:"
-      '';
+    installPhase = ''
+      cp -dr --no-preserve='ownership' . $out/
+      wrapProgram $out/manage.py \
+        --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:"
+    '';
+
+    passthru = rec {
+      python = prev.python3;
+      pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
+    };
+  });
+  # (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=";
+    };
+  });
 
-      passthru = rec {
-        python = prev.python3;
-        pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
-      };
-    });
 
 }

overlays/prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch

@@ -0,0 +1,25 @@
+From f4c5dd5628c873981b2d6d6b8f3bbf036b9fd724 Mon Sep 17 00:00:00 2001
+From: Rouven Seifert <rouven.seifert@ifsr.de>
+Date: Thu, 2 May 2024 11:20:27 +0200
+Subject: [PATCH] cleanup: also catch milter-reject
+
+---
+ postfix_exporter.go | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/postfix_exporter.go b/postfix_exporter.go
+index f20d99c..676d767 100644
+--- a/postfix_exporter.go
++++ b/postfix_exporter.go
+@@ -335,6 +335,8 @@ func (e *PostfixExporter) CollectFromLogLine(line string) {
+ 				e.cleanupProcesses.Inc()
+ 			} else if strings.Contains(remainder, ": reject: ") {
+ 				e.cleanupRejects.Inc()
++			} else if strings.Contains(remainder, ": milter-reject: ") {
++				e.cleanupRejects.Inc()
+ 			} else {
+ 				e.addToUnsupportedLine(line, subprocess, level)
+ 			}
+-- 
+2.44.0
+