From 50cd2305c4a696c94fc78e2fd134aaaf0df688f5 Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 10 May 2025 00:10:09 +0200 Subject: [PATCH 1/4] Enable prometheus alertmanager --- config/hosts/metrics/nginx.nix | 19 +++++++++++++++++++ config/hosts/metrics/prometheus.nix | 6 ++++++ .../virtualHosts/acme-challenge.nix | 1 + 3 files changed, 26 insertions(+) diff --git a/config/hosts/metrics/nginx.nix b/config/hosts/metrics/nginx.nix index 9e31454..aefb0b5 100644 --- a/config/hosts/metrics/nginx.nix +++ b/config/hosts/metrics/nginx.nix @@ -22,6 +22,25 @@ proxyWebsockets = true; }; }; + "alertmanager.grzb.de"= { + forceSSL = true; + enableACME = true; + listen = [ + { + addr = "0.0.0.0"; + port = 80; + } + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + ]; + locations."/" = { + proxyPass = "http://${config.services.prometheus.alertmanager.listenAddress}:${builtins.toString config.services.prometheus.alertmanager.port}"; + proxyWebsockets = true; + }; + }; }; }; } diff --git a/config/hosts/metrics/prometheus.nix b/config/hosts/metrics/prometheus.nix index c4b45b1..b45eb94 100644 --- a/config/hosts/metrics/prometheus.nix +++ b/config/hosts/metrics/prometheus.nix @@ -2,6 +2,7 @@ { services.prometheus = { enable = true; + retentionTime = "90d"; scrapeConfigs = [ { job_name = "node"; @@ -15,5 +16,10 @@ }) (builtins.attrNames hosts); } ]; + alertmanager = { + enable = true; + listenAddress = "localhost"; + webExternalUrl = "https://alertmanager.grzb.de"; + }; }; } diff --git a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix index 8f38379..38d2804 100644 --- a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix +++ b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix @@ -1,6 +1,7 @@ { ... }: let acmeDomainMap = { + "alertmanager.grzb.de" = "metrics.vs.grzb.de"; "jellyfin.grzb.de" = "jellyfin.vs.grzb.de"; "mail-1.grzb.de" = "mail-1.vs.grzb.de"; "mas.nekover.se" = "matrix.vs.grzb.de"; From 26ab8bc86e7b79d86db506aa9b04faf1f4ef1711 Mon Sep 17 00:00:00 2001 From: fi Date: Sun, 15 Jun 2025 21:43:21 +0200 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/db926a14a923e4b14d474577efac0b6d93900941?narHash=sha256-cKo4Kczm4e7IY1fix2Tj9Kn%2BUUHVR1Goy42mz2hUGng%3D' (2025-06-14) → 'github:NixOS/nixpkgs/309c59af092b9044a9edfc781cfbf6aa258403c9?narHash=sha256-BpIk0JqIzN9Ws4keIaf2FquNF46W5oyjhi2g0cGp3ks%3D' (2025-06-15) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/2756c1e5dc0ad0a66f679918a2ec017399bba1a4?narHash=sha256-4/xR/fd5INr/8CWVc4uTnSAYF%2BsoQsgyqubFBQoCtU8%3D' (2025-06-14) → 'github:NixOS/nixpkgs/edcaeb67ef6ef8d57443ddc35be953d8ac39258b?narHash=sha256-lO6pbyJy8AlmCH50M9Am1L6BmvrGwI6qqQYhyBp/DQI%3D' (2025-06-15) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/ba48a1f6ce571455cb631dee840c6cd401ea4adb?narHash=sha256-6%2BAmSZBogyr1zbVc2k4IBcmY/Yt39mC4%2BcfZi0n/AAA%3D' (2025-06-14) → 'github:NixOS/nixpkgs/68eb4789b2a9881bcaad2f88fb3771bc7c7f24fa?narHash=sha256-y6frNvpXfbFWfzcCXs1WTRb0ynRbov0sWT9XJPBe%2BgQ%3D' (2025-06-15) • Updated input 'simple-nixos-mailserver/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) → 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885?narHash=sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX%2BfjA8Xf8PUmqCY%3D' (2025-05-12) • Updated input 'simple-nixos-mailserver/git-hooks': 'github:cachix/git-hooks.nix/623c56286de5a3193aa38891a6991b28f9bab056?narHash=sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4%3D' (2025-06-11) → 'github:cachix/git-hooks.nix/dcf5072734cb576d2b0c59b2ac44f5050b5eac82?narHash=sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco%3D' (2025-03-22) • Updated input 'simple-nixos-mailserver/nixpkgs': 'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81?narHash=sha256-Kh9K4taXbVuaLC0IL%2B9HcfvxsSUx8dPB5s5weJcc9pc%3D' (2025-06-13) → 'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D' (2025-05-13) • Updated input 'simple-nixos-mailserver/nixpkgs-25_05': 'github:NixOS/nixpkgs/fd487183437963a59ba763c0cc4f27e3447dd6dd?narHash=sha256-mHv/yeUbmL91/TvV95p%2BmBVahm9mdQMJoqaTVTALaFw%3D' (2025-06-12) → 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d?narHash=sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh%2BR0EKZfroAc%3D' (2025-05-18) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 756fecc..79452d8 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749882819, - "narHash": "sha256-cKo4Kczm4e7IY1fix2Tj9Kn+UUHVR1Goy42mz2hUGng=", + "lastModified": 1749997939, + "narHash": "sha256-BpIk0JqIzN9Ws4keIaf2FquNF46W5oyjhi2g0cGp3ks=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db926a14a923e4b14d474577efac0b6d93900941", + "rev": "309c59af092b9044a9edfc781cfbf6aa258403c9", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1749914561, - "narHash": "sha256-4/xR/fd5INr/8CWVc4uTnSAYF+soQsgyqubFBQoCtU8=", + "lastModified": 1750014763, + "narHash": "sha256-lO6pbyJy8AlmCH50M9Am1L6BmvrGwI6qqQYhyBp/DQI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2756c1e5dc0ad0a66f679918a2ec017399bba1a4", + "rev": "edcaeb67ef6ef8d57443ddc35be953d8ac39258b", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749896453, - "narHash": "sha256-6+AmSZBogyr1zbVc2k4IBcmY/Yt39mC4+cfZi0n/AAA=", + "lastModified": 1749984698, + "narHash": "sha256-y6frNvpXfbFWfzcCXs1WTRb0ynRbov0sWT9XJPBe+gQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba48a1f6ce571455cb631dee840c6cd401ea4adb", + "rev": "68eb4789b2a9881bcaad2f88fb3771bc7c7f24fa", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { From 2765e926445498962b5e6c1cd1250f2dc7fee1de Mon Sep 17 00:00:00 2001 From: fi Date: Sun, 29 Jun 2025 21:40:34 +0200 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/309c59af092b9044a9edfc781cfbf6aa258403c9?narHash=sha256-BpIk0JqIzN9Ws4keIaf2FquNF46W5oyjhi2g0cGp3ks%3D' (2025-06-15) → 'github:NixOS/nixpkgs/7821ec89cbd9ae16ac64a896695f69010a14d296?narHash=sha256-Vev0zwGq3SdXWYUYa%2BzMLI0vyqIaYbSwZzAEqHNaG1c%3D' (2025-06-29) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/edcaeb67ef6ef8d57443ddc35be953d8ac39258b?narHash=sha256-lO6pbyJy8AlmCH50M9Am1L6BmvrGwI6qqQYhyBp/DQI%3D' (2025-06-15) → 'github:NixOS/nixpkgs/6193b8d04ba5a5358cac7402b51948fe70b33b19?narHash=sha256-3SkElpRtpLPPUsD2Th60pznnT5Y3wKjOwivSAekPPpI%3D' (2025-06-29) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/68eb4789b2a9881bcaad2f88fb3771bc7c7f24fa?narHash=sha256-y6frNvpXfbFWfzcCXs1WTRb0ynRbov0sWT9XJPBe%2BgQ%3D' (2025-06-15) → 'github:NixOS/nixpkgs/650e71cbf76de8dd16f5648a96981b726c4ef8fe?narHash=sha256-omYD%2BH5LlSihz2DRfv90I8Oeo7JNEwvcHPHX%2B6nMIM4%3D' (2025-06-29) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 79452d8..34cb259 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749997939, - "narHash": "sha256-BpIk0JqIzN9Ws4keIaf2FquNF46W5oyjhi2g0cGp3ks=", + "lastModified": 1751201298, + "narHash": "sha256-Vev0zwGq3SdXWYUYa+zMLI0vyqIaYbSwZzAEqHNaG1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "309c59af092b9044a9edfc781cfbf6aa258403c9", + "rev": "7821ec89cbd9ae16ac64a896695f69010a14d296", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1750014763, - "narHash": "sha256-lO6pbyJy8AlmCH50M9Am1L6BmvrGwI6qqQYhyBp/DQI=", + "lastModified": 1751225728, + "narHash": "sha256-3SkElpRtpLPPUsD2Th60pznnT5Y3wKjOwivSAekPPpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edcaeb67ef6ef8d57443ddc35be953d8ac39258b", + "rev": "6193b8d04ba5a5358cac7402b51948fe70b33b19", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749984698, - "narHash": "sha256-y6frNvpXfbFWfzcCXs1WTRb0ynRbov0sWT9XJPBe+gQ=", + "lastModified": 1751203939, + "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68eb4789b2a9881bcaad2f88fb3771bc7c7f24fa", + "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", "type": "github" }, "original": { From 2133779fe2cbacdf6078417e18980b1e173843e7 Mon Sep 17 00:00:00 2001 From: fi Date: Sun, 29 Jun 2025 21:46:42 +0200 Subject: [PATCH 4/4] Disable alertmanager for now --- config/hosts/metrics/prometheus.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/hosts/metrics/prometheus.nix b/config/hosts/metrics/prometheus.nix index b45eb94..236fb58 100644 --- a/config/hosts/metrics/prometheus.nix +++ b/config/hosts/metrics/prometheus.nix @@ -16,10 +16,5 @@ }) (builtins.attrNames hosts); } ]; - alertmanager = { - enable = true; - listenAddress = "localhost"; - webExternalUrl = "https://alertmanager.grzb.de"; - }; }; }