From ff5f8ffc8016127ceacdf39d9890fd63cbbdfbc7 Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Thu, 12 Jun 2025 20:04:02 +0200
Subject: [PATCH] ntfy-alertmanager silence now works
---
.../ntfy-alertmanager-ccchh-critical.j2 | 2 +-
.../docker_compose/ntfy-alertmanager-ccchh.j2 | 2 +-
.../ntfy-alertmanager-fux-critical.j2 | 2 +-
.../docker_compose/ntfy-alertmanager-fux.j2 | 2 +-
.../grafana/nginx/grafana.hamburg.ccc.de.conf | 67 +++++++++++++++++++
5 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2
index 3ec4153..b4afc90 100644
--- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2
+++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2
@@ -1,4 +1,4 @@
-base-url https://grafana.hamburg.ccc.de/ccchh-alertmanager-critical
+base-url https://grafana.hamburg.ccc.de/ntfy-alertmanager-ccchh-critical
http-address :8000
log-level info
log-format text
diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2
index c143338..66fd9ab 100644
--- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2
+++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2
@@ -1,4 +1,4 @@
-base-url https://grafana.hamburg.ccc.de/ccchh-alertmanager
+base-url https://grafana.hamburg.ccc.de/ntfy-alertmanager-ccchh
http-address :8010
log-level info
log-format text
diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2
index d6c0aae..afb6cc8 100644
--- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2
+++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2
@@ -1,4 +1,4 @@
-base-url https://grafana.hamburg.ccc.de/fux-alertmanager-critical
+base-url https://grafana.hamburg.ccc.de/ntfy-alertmanager-fux-critical
http-address :8001
log-level info
log-format text
diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2
index 2718684..1e506a3 100644
--- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2
+++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2
@@ -1,4 +1,4 @@
-base-url https://grafana.hamburg.ccc.de/fux-alertmanager
+base-url https://grafana.hamburg.ccc.de/ntfy-alertmanager-fux
http-address :8011
log-level info
log-format text
diff --git a/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf b/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf
index d623198..c5b68e1 100644
--- a/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf
+++ b/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf
@@ -41,4 +41,71 @@ server {
proxy_pass http://127.0.0.1:3000/;
}
+ location /ntfy-alertmanager-ccchh-critical/ {
+ deny all;
+ allow ::1/128;
+ allow 127.0.0.1/32;
+ # Wieske
+ allow 172.31.17.128/25;
+ allow 212.12.51.128/28;
+ allow 2a00:14b0:42:100::/56; #Neues v6 gerouted via neuem Router
+ allow 2a00:14b0:4200:3000::/64; #Bei Wieske
+ allow 2a00:14b0:4200:3380::/64;
+ allow 2a00:14b0:f000:23::/64; #CCCHH v6 bei Wieske, geroutet über turing
+ # Z9
+ allow 2a07:c480:0:100::/56;
+ allow 2a07:c481:1::/48;
+ proxy_pass http://127.0.0.1:8000/;
+ }
+
+ location /ntfy-alertmanager-ccchh/ {
+ deny all;
+ allow ::1/128;
+ allow 127.0.0.1/32;
+ # Wieske
+ allow 172.31.17.128/25;
+ allow 212.12.51.128/28;
+ allow 2a00:14b0:42:100::/56; #Neues v6 gerouted via neuem Router
+ allow 2a00:14b0:4200:3000::/64; #Bei Wieske
+ allow 2a00:14b0:4200:3380::/64;
+ allow 2a00:14b0:f000:23::/64; #CCCHH v6 bei Wieske, geroutet über turing
+ # Z9
+ allow 2a07:c480:0:100::/56;
+ allow 2a07:c481:1::/48;
+ proxy_pass http://127.0.0.1:8010/;
+ }
+
+ location /ntfy-alertmanager-fux-critical/ {
+ deny all;
+ allow ::1/128;
+ allow 127.0.0.1/32;
+ # Wieske
+ allow 172.31.17.128/25;
+ allow 212.12.51.128/28;
+ allow 2a00:14b0:42:100::/56; #Neues v6 gerouted via neuem Router
+ allow 2a00:14b0:4200:3000::/64; #Bei Wieske
+ allow 2a00:14b0:4200:3380::/64;
+ allow 2a00:14b0:f000:23::/64; #CCCHH v6 bei Wieske, geroutet über turing
+ # Z9
+ allow 2a07:c480:0:100::/56;
+ allow 2a07:c481:1::/48;
+ proxy_pass http://127.0.0.1:8001/;
+ }
+
+ location /ntfy-alertmanager-fux/ {
+ deny all;
+ allow ::1/128;
+ allow 127.0.0.1/32;
+ # Wieske
+ allow 172.31.17.128/25;
+ allow 212.12.51.128/28;
+ allow 2a00:14b0:42:100::/56; #Neues v6 gerouted via neuem Router
+ allow 2a00:14b0:4200:3000::/64; #Bei Wieske
+ allow 2a00:14b0:4200:3380::/64;
+ allow 2a00:14b0:f000:23::/64; #CCCHH v6 bei Wieske, geroutet über turing
+ # Z9
+ allow 2a07:c480:0:100::/56;
+ allow 2a07:c481:1::/48;
+ proxy_pass http://127.0.0.1:8011/;
+ }
}