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 905431e..3ec4153 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh-critical.j2 @@ -1,3 +1,4 @@ +base-url https://grafana.hamburg.ccc.de/ccchh-alertmanager-critical http-address :8000 log-level info log-format text @@ -27,6 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" + priority 2 } ntfy { @@ -35,6 +37,10 @@ ntfy { access-token {{ secret__ntfy_token }} } +alertmanager { + silence-duration 3h +} + cache { type memory duration 12h diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 index 80ef84e..c143338 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-ccchh.j2 @@ -1,3 +1,4 @@ +base-url https://grafana.hamburg.ccc.de/ccchh-alertmanager http-address :8010 log-level info log-format text @@ -27,6 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" + priority 2 } ntfy { @@ -35,6 +37,10 @@ ntfy { access-token {{ secret__ntfy_token }} } +alertmanager { + silence-duration 3h +} + cache { type memory duration 12h 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 606c0fb..d6c0aae 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux-critical.j2 @@ -1,3 +1,4 @@ +base-url https://grafana.hamburg.ccc.de/fux-alertmanager-critical http-address :8001 log-level info log-format text @@ -27,6 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" + priority 2 } ntfy { @@ -35,6 +37,10 @@ ntfy { access-token {{ secret__ntfy_token }} } +alertmanager { + silence-duration 3h +} + cache { type memory duration 12h diff --git a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 index 1ae976e..2718684 100644 --- a/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 +++ b/resources/chaosknoten/grafana/docker_compose/ntfy-alertmanager-fux.j2 @@ -1,3 +1,4 @@ +base-url https://grafana.hamburg.ccc.de/fux-alertmanager http-address :8011 log-level info log-format text @@ -27,6 +28,7 @@ labels { resolved { tags "white_check_mark,resolved" + priority 2 } ntfy { @@ -35,6 +37,10 @@ ntfy { access-token {{ secret__ntfy_token }} } +alertmanager { + silence-duration 3h +} + cache { type memory duration 12h diff --git a/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf b/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf index a3218d1..d623198 100644 --- a/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf +++ b/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf @@ -2,7 +2,8 @@ # https://ssl-config.mozilla.org/#server=nginx&version=1.17.7&config=intermediate&openssl=1.1.1k&guideline=5.6 server { # Listen on a custom port for the proxy protocol. - listen 8443 ssl http2 proxy_protocol; + listen 8443 ssl proxy_protocol; + http2 on; # Make use of the ngx_http_realip_module to set the $remote_addr and # $remote_port to the client address and client port, when using proxy # protocol.