From eb21fd796fcb5043dcfdc2a067e2556ba1d9cdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Sat, 5 Sep 2026 01:33:15 +0000
Subject: [PATCH] modified:  
 services/monitoring/deploy/alloy/node-scraper/helm-values.yaml

---
 .../alloy/node-scraper/helm-values.yaml       | 50 +++++--------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml b/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml
index 9acdcd1..b955a13 100644
--- a/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml
+++ b/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml
@@ -187,33 +187,6 @@ alloy:
           target_label = "cluster"
           replacement  = env("CLUSTER_NAME")
         }
-
-        rule {
-          target_label = "job"
-          replacement  = env("JOB")
-        }
-
-        rule {
-
-          target_label = "container"
-          replacement  = env("CONTAINER")
-        }
-        rule {
-
-          target_label = "NS"
-          replacement  = env("NS")
-        }
-
-        rule {
-          target_label = "pod"
-          replacement  = env("POD")
-        }
-
-        rule {
-          target_label = "service"
-          replacement  = env("SERVICE")
-        }
-
         # trying to reduce memory usage
         rule {
           source_labels = ["__name__"]
@@ -228,6 +201,15 @@ alloy:
       prometheus.scrape "cadvisor" {
         targets = ["localhost:8080"]
         scrape_interval = "60s"
+        forward_to = [prometheus.remote_write.metrics_service.receiver]
+      }
+
+      prometheus.relabel "cadvisor_node" {
+        rule {
+          target_label = "node"
+          replacement  = env("NODE_NAME")
+        }
+        forward_to = [prometheus.remote_write.metrics_service.receiver]
       }
 
       prometheus.remote_write "metrics_service" {
@@ -243,18 +225,12 @@ alloy:
       valueFrom:
         fieldRef:
           fieldPath: status.hostIP
+    - name: NODE_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: spec.nodeName
     - name: CLUSTER_NAME
       value: casa
-    - name: JOB
-      value: node-exporter
-    - name: CONTAINER
-      value: node-exporter
-    - name: NS
-      value: monitoring
-    - name: POD
-      value: alloy-node-scraper
-    - name: SERVICE
-      value: alloy-node-scraper
     - name: ZONE
       value: casa-vlan
     - name: LOKI_URL