alloy; revision

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

@@ -58,6 +58,7 @@ alloy:
   # https://grafana.com/docs/alloy/latest/collect/logs-in-kubernetes/
   configMap:
     content: |
+    
       // ============================================
       // LOKI WRITE TARGET
       // ============================================
@@ -123,9 +124,30 @@ alloy:
 
         forward_to = [loki.write.loki_srv.receiver]
       }
+
+
       // ============================================
-      // prometheus unix exporter
+      // Metrics: Prometheus connection config
       // ============================================
+
+      prometheus.remote_write "metrics_service" {
+        endpoint {
+          url = env("PROMETHEUS_URL")
+        }
+        
+        // global labels
+        external_labels = {
+          cluster = env("CLUSTER_NAME"),
+          zone    = env("ZONE"),
+          node    = env("HOSTNAME")
+        }
+      }
+
+
+      // ============================================
+      // Metrics: Prometheus Unix Exporter
+      // ============================================
+
       prometheus.exporter.unix "node_exporter" {
         rootfs_path = "/host"
         disable_collectors = ["ipvs", "btrfs", "infiniband", "xfs", "zfs"]
@@ -153,78 +175,18 @@ alloy:
           device_exclude = "^(veth.*|cali.*|[a-f0-9]{15})$"
         }
       }
-    
+
       prometheus.scrape "node_exporter" {
         targets         = prometheus.exporter.unix.node_exporter.targets
         scrape_interval = "30s"
 
         forward_to = [prometheus.relabel.node_exporter.receiver]
       }
-
+  
       prometheus.relabel "node_exporter" {
-
-        rule {
-          target_label = "instance"
-          replacement  = env("NODE_IP") + ":9100"
-        }
-
-        rule {
-          target_label = "nodename"
-          replacement  = env("HOSTNAME")
-        }
-
-        rule {
-          target_label = "node"
-          replacement  = env("HOSTNAME")
-        }
-
-        rule {
-          target_label = "kubernetes_node"
-          replacement  = env("HOSTNAME")
-        }
-
-        rule {
-          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")
-        }
-
         forward_to = [prometheus.remote_write.metrics_service.receiver]
-
       }
 
-      prometheus.remote_write "metrics_service" {
-
-        endpoint {
-          url = env("PROMETHEUS_URL")
-        }
-
-      }
 
   extraEnv:
     - name: NODE_IP