diff --git a/inventories/chaosknoten/host_vars/grafana.yaml b/inventories/chaosknoten/host_vars/grafana.yaml index d98ef03..c0f2ad9 100644 --- a/inventories/chaosknoten/host_vars/grafana.yaml +++ b/inventories/chaosknoten/host_vars/grafana.yaml @@ -104,8 +104,8 @@ alloy_config: | prometheus.relabel "default" { forward_to = [prometheus.remote_write.default.receiver] rule { - target_label = "org" - replacement = "ccchh" + replacement = "org" + target_label = "ccchh" } rule { target_label = "host" diff --git a/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf b/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf index 82a0b24..a431821 100644 --- a/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf +++ b/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf @@ -7,8 +7,6 @@ server { # Z9 allow 2a07:c480:0:100::/56; allow 2a07:c481:1::/48; - # fuxnoc - allow 2a07:c481:0:1::/64; deny all; listen [2a00:14b0:4200:3380:0000:5a5f:1dbc:6a39]:443 ssl; diff --git a/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2 b/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2 index 6ccb7d7..1dfcd6c 100644 --- a/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2 +++ b/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2 @@ -1,2 +1 @@ chaos:{{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/grafana/metrics_chaos_basic_auth", create=false, missing="error") }} -fux:{{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/grafana/metrics_fux_basic_auth", create=false, missing="error") }}