From bd9e04eef84368f19b8a27308958fc2061162b9a Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Wed, 30 Apr 2025 02:16:09 +0200
Subject: [PATCH 1/2] metrics fux

---
 resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf | 2 ++
 resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf b/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf
index a431821..82a0b24 100644
--- a/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf
+++ b/resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf
@@ -7,6 +7,8 @@ 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 1dfcd6c..6ccb7d7 100644
--- a/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2
+++ b/resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2
@@ -1 +1,2 @@
 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") }}

From 0c9e3ccb87a570a8b627096c2527ed732e5a8501 Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Wed, 30 Apr 2025 15:07:26 +0200
Subject: [PATCH 2/2] fix switchup in prometheus.relabel

---
 inventories/chaosknoten/host_vars/grafana.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inventories/chaosknoten/host_vars/grafana.yaml b/inventories/chaosknoten/host_vars/grafana.yaml
index c0f2ad9..d98ef03 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 {
-      replacement = "org"
-      target_label = "ccchh"
+      target_label = "org"
+      replacement = "ccchh"
     }
     rule {
       target_label = "host"