From 84c204b59d2c9c6cd8574502ac3d139103f3bc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Sun, 4 Oct 2026 21:08:53 +0000
Subject: [PATCH] modified:   monitoring/base/alloy/node-scraper/config.alloy

---
 .../base/alloy/node-scraper/config.alloy      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/monitoring/base/alloy/node-scraper/config.alloy b/monitoring/base/alloy/node-scraper/config.alloy
index 2f7db1a..efa7ab6 100644
--- a/monitoring/base/alloy/node-scraper/config.alloy
+++ b/monitoring/base/alloy/node-scraper/config.alloy
@@ -224,15 +224,18 @@ prometheus.relabel "node_exporter" {
 
 discovery.kubernetes "kube_nodes" {
   role = "node"
-	selectors {
-		role  = "node"
-		field = "spec.nodeName=" + coalesce(env("HOSTNAME"), constants.hostname)
-	}
 }
 
 discovery.relabel "kubelet" {
   targets = discovery.kubernetes.kube_nodes.targets
 
+ rule {
+    source_labels = ["__meta_kubernetes_node_name"]
+    regex         = coalesce(env("HOSTNAME"), constants.hostname)
+    action        = "keep"
+  }
+
+
   rule {
     regex  = ".*_uid$|.*_id$|^annotation_.*|^label_.*|^endpoint_.*|^pod_ip$"
     action = "drop"
@@ -313,6 +316,12 @@ prometheus.scrape "kubelet" {
   discovery.relabel "kube_node_metrics" {
   targets = discovery.kubernetes.kube_nodes.targets
 
+ rule {
+    source_labels = ["__meta_kubernetes_node_name"]
+    regex         = coalesce(env("HOSTNAME"), constants.hostname)
+    action        = "keep"
+  }
+
   rule {
     regex  = ".*_uid$|.*_id$|^annotation_.*|^label_.*|^endpoint_.*|^pod_ip$"
     action = "drop"
@@ -401,7 +410,7 @@ discovery.relabel "kube_state_metrics" {
     regex         = coalesce(env("HOSTNAME"), constants.hostname)
     action        = "keep"
   }
-  
+
   rule {
     source_labels = ["__meta_kubernetes_service_name"]
     regex         = "kube-state-metrics"