modified: services/monitoring/deploy/alloy/node-scraper/helm-values.yaml

modified:   services/monitoring/deploy/flux/kustomization.yaml

services/monitoring/deploy/alloy/node-scraper/helm-values.yaml

@@ -139,8 +139,6 @@ alloy:
         external_labels = {
           cluster     = env("CLUSTER_NAME"),
           zone        = env("ZONE"),
-          node        = env("HOSTNAME"),
-          nodename    = env("HOSTNAME"),
         }
       }
 
@@ -186,9 +184,22 @@ alloy:
   
       prometheus.relabel "node_exporter" {
         forward_to = [prometheus.remote_write.metrics_service.receiver]
+
+        rule {
+          action       = "replace"
+          replacement  = env("HOSTNAME")
+          target_label = "nodename"
+        }
+
+        rule {
+          action       = "replace"
+          replacement  = env("HOSTNAME")
+          target_label = "node"
+        }
       }
 
 
+
   extraEnv:
     - name: NODE_IP
       valueFrom:

services/monitoring/deploy/flux/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: monitoring
 resources:
  - flux-kustomization-alloy.yaml 
- - flux-kustomization-prometheus.yaml
+ #- flux-kustomization-prometheus.yaml
 secretGenerator:
   - name: flux-sops-age
     files: