wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

prometheus: patch the postfix exporter to catch rspamd rejects

Browse source
This commit is contained in:
Rouven Seifert 2024-05-02 11:23:13 +02:00
parent 1f4e9a620b
commit 197956ea90
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
overlays/default.nix
View file

@ -13,7 +13,10 @@ in
}; };
})); }));
# (hopefully) fix systemd journal reading # (hopefully) fix systemd journal reading
prometheus-postfix-exporter = prev.prometheus-postfix-exporter.overrideAttrs (old: rec { prometheus-postfix-exporter = prev.prometheus-postfix-exporter.overrideAttrs (old: {
patches = [
./prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "adangel"; owner = "adangel";
repo = "postfix_exporter"; repo = "postfix_exporter";

25
overlays/prometheus-postfix-exporter/0001-cleanup-also-catch-milter-reject.patch Normal file
View file

@ -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