From 5e2df37cdbef574e73f3c2296e8a220eb3ef1fd9 Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Thu, 22 Oct 2026 12:10:02 +0200 Subject: [PATCH 1/5] flake update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 81e3e05..0cfaf62 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790734419, - "narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=", + "lastModified": 1792507013, + "narHash": "sha256-8tKjSQajD3mUND1GaAuaWTcuyUpgcGsh5V+l4ibzC7U=", "owner": "ryantm", "repo": "agenix", - "rev": "3daa710894355fa2fad8243380af373a2b4046ef", + "rev": "5e5b88a0c8e56f291a108c2fe9934054d9745b2e", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1791935857, - "narHash": "sha256-Zrhxwe8+HMRiDpjsOIoOIUvK6b8HCp3FL5R50N901hU=", + "lastModified": 1792622593, + "narHash": "sha256-Bje51pDaL2oqLqC9TxTmr3gwKoIGpOraL4UIOnpfZJo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "952dd4355e1932709b993aa31de5e5b7bbe114f7", + "rev": "d544efa48c201dc307853464df7b9ded6cda2d30", "type": "github" }, "original": { From b6ff9a35ff1ca2ca7c6dbef659baef53460f72a0 Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Mon, 26 Oct 2026 10:05:33 +0100 Subject: [PATCH 2/5] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0cfaf62..d274858 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792622593, - "narHash": "sha256-Bje51pDaL2oqLqC9TxTmr3gwKoIGpOraL4UIOnpfZJo=", + "lastModified": 1792926719, + "narHash": "sha256-zwKdE7sT2nhFOxXZVBkxH7RQw3J61coMAewFjNFSjR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d544efa48c201dc307853464df7b9ded6cda2d30", + "rev": "3ea16152199721889ec1b3e9ab1503dbadc583ef", "type": "github" }, "original": { From cb4499301142e9bf1864acd5d9a0cae4e8203d7e Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 27 Oct 2026 20:11:57 +0100 Subject: [PATCH 3/5] switch monitoring to mariko --- services/prometheus-nginx.nix | 8 ++++---- services/prometheus-node.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/prometheus-nginx.nix b/services/prometheus-nginx.nix index 58b028e..911072a 100644 --- a/services/prometheus-nginx.nix +++ b/services/prometheus-nginx.nix @@ -1,8 +1,8 @@ { config, ... }: let - kaede_ipv4 = "159.195.204.204/32"; - kaede_ipv6 = "2a0a:4cc0:c2:b028::/64"; + mariko_ipv4 = "185.163.117.133/32"; + mariko_ipv6 = "2a03:4000:3b:28b::/64"; cccb_mon_ipv4 = "195.160.173.14/32"; cccb_mon_ipv6 = "2001:678:760:cccb::14/128"; in @@ -12,9 +12,9 @@ in openFirewall = true; firewallRules = '' ip6 saddr ${cccb_mon_ipv6} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip6 saddr ${kaede_ipv6} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip6 saddr ${mariko_ipv6} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow uptime-kuma on mon.xengi.de" ip saddr ${cccb_mon_ipv4} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip saddr ${kaede_ipv4} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip saddr ${mariko_ipv4} tcp dport ${toString config.services.prometheus.exporters.nginx.port} accept comment "Allow uptime-kuma on mon.xengi.de" ''; }; } diff --git a/services/prometheus-node.nix b/services/prometheus-node.nix index acce6a3..9559f2d 100644 --- a/services/prometheus-node.nix +++ b/services/prometheus-node.nix @@ -1,8 +1,8 @@ { config, ... }: let - kaede_ipv4 = "159.195.204.204/32"; - kaede_ipv6 = "2a0a:4cc0:c2:b028::/64"; + mariko_ipv4 = "185.163.117.133/32"; + mariko_ipv6 = "2a03:4000:3b:28b::/64"; cccb_mon_ipv4 = "195.160.173.14/32"; cccb_mon_ipv6 = "2001:678:760:cccb::14/128"; in @@ -12,9 +12,9 @@ in openFirewall = true; firewallRules = '' ip6 saddr ${cccb_mon_ipv6} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip6 saddr ${kaede_ipv6} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip6 saddr ${mariko_ipv6} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow uptime-kuma on mon.xengi.de" ip saddr ${cccb_mon_ipv4} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip saddr ${kaede_ipv4} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip saddr ${mariko_ipv4} tcp dport ${toString config.services.prometheus.exporters.node.port} accept comment "Allow uptime-kuma on mon.xengi.de" ''; enabledCollectors = [ ]; disabledCollectors = [ ]; From 7488f3cd482a28001b9a23eeb54b4c709bac1004 Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 27 Oct 2026 20:12:48 +0100 Subject: [PATCH 4/5] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d274858..f2ac8bf 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792926719, - "narHash": "sha256-zwKdE7sT2nhFOxXZVBkxH7RQw3J61coMAewFjNFSjR4=", + "lastModified": 1793064696, + "narHash": "sha256-IuHLjgL4i3x3q5VjIpVzRq3kI2kJqq1ogNTjOMQomHQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ea16152199721889ec1b3e9ab1503dbadc583ef", + "rev": "4fb45a87dacd6124244d97a70dd04d0419964c33", "type": "github" }, "original": { From f9043ef9d0838e6714a391e3ed284b6cada7348a Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Tue, 27 Oct 2026 20:22:25 +0100 Subject: [PATCH 5/5] switch to mariko --- hosts/sql/prometheus-postgres.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sql/prometheus-postgres.nix b/hosts/sql/prometheus-postgres.nix index 5e68a7a..c09d6c6 100644 --- a/hosts/sql/prometheus-postgres.nix +++ b/hosts/sql/prometheus-postgres.nix @@ -7,9 +7,9 @@ runAsLocalSuperUser = true; firewallRules = '' ip6 saddr 2001:678:760:cccb::14/128 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip6 saddr 2a0a:4cc0:c2:b028::/64 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip6 saddr 2a03:4000:3b:28b::/64 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow uptime-kuma on mon.xengi.de" ip saddr 195.160.173.14/32 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow prometheus on monitoring.berlin.ccc.de" - ip saddr 159.195.204.204/32 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow uptime-kuma on mon.xengi.de" + ip saddr 185.163.117.133/32 tcp dport ${toString config.services.prometheus.exporters.postgres.port} accept comment "Allow uptime-kuma on mon.xengi.de" ''; }; }