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

monitoring: remove postfix

Browse source
This commit is contained in:
Rouven Seifert 2024-11-08 11:19:59 +01:00
parent 06281a1432
commit 8e3a5b0ff3
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
2 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/monitoring/default.nix
View file

@ -37,12 +37,8 @@ in
token_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/token"; token_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/token";
api_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/userinfo"; api_url = "https://sso.ifsr.de/realms/internal/protocol/openid-connect/userinfo";
role_attribute_path = "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'"; role_attribute_path = "contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'";
}; };
}; };
}; };
services.postgresql = { services.postgresql = {
@ -65,10 +61,6 @@ in
enabledCollectors = [ "systemd" ]; enabledCollectors = [ "systemd" ];
port = 9002; port = 9002;
}; };
postfix = {
enable = true;
port = 9003;
};
}; };
scrapeConfigs = [ scrapeConfigs = [
{ {
@ -78,13 +70,6 @@ in
}]; }];
scrape_interval = "15s"; 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"; job_name = "rspamd";
static_configs = [{ static_configs = [{

12
overlays/default.nix
View file

@ -12,18 +12,6 @@ in
sha256 = "sha256-3w+FJezbo4DnS1N8pxrfO3WWWT8CGJtZqw6//IXMyN4="; 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 # Mailman internal server error fix
# https://gitlab.com/mailman/mailman/-/issues/1137 # https://gitlab.com/mailman/mailman/-/issues/1137
# https://github.com/NixOS/nixpkgs/pull/321136 # https://github.com/NixOS/nixpkgs/pull/321136