From 8c75b869f19ac7854577499f6717f79d9adc5069 Mon Sep 17 00:00:00 2001
From: pgijsbertsen <117165507+pgijsbertsen@users.noreply.github.com>
Date: Fri, 24 Apr 2026 15:03:34 +0200
Subject: [PATCH] chore: Improve parsed metrics

---
 k8s-peterg/alloy/configmap.yaml   | 27 ++++++++++++++++++++++++++-
 k8s-wheatley/alloy/configmap.yaml | 30 ++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/k8s-peterg/alloy/configmap.yaml b/k8s-peterg/alloy/configmap.yaml
index 18b2843..052ec28 100644
--- a/k8s-peterg/alloy/configmap.yaml
+++ b/k8s-peterg/alloy/configmap.yaml
@@ -6,6 +6,11 @@ metadata:
 data:
   config.alloy: |-
     prometheus.exporter.unix "node" {
+      set_collectors = [
+        "cpu", "diskstats", "filesystem", "loadavg",
+        "meminfo", "netdev", "netstat", "os",
+        "pressure", "processes", "stat", "uname", "vmstat",
+      ]
     }
 
     discovery.kubernetes "kubernetes_apiservers" {
@@ -141,6 +146,11 @@ data:
         source_labels = ["__meta_kubernetes_pod_node_name"]
         target_label  = "node"
       }
+
+      rule {
+        regex  = "pod_template_hash|controller_revision_hash|deployment_kubernetes_io_revision"
+        action = "labeldrop"
+      }
     }
 
     discovery.relabel "kubernetes_services" {
@@ -249,6 +259,11 @@ data:
         source_labels = ["__meta_kubernetes_pod_node_name"]
         target_label  = "node"
       }
+
+      rule {
+        regex  = "pod_template_hash|controller_revision_hash|deployment_kubernetes_io_revision"
+        action = "labeldrop"
+      }
     }
 
     discovery.relabel "pod_logs" {
@@ -352,9 +367,19 @@ data:
       }
     }
 
+    prometheus.relabel "cadvisor" {
+      forward_to = [prometheus.remote_write.default.receiver]
+
+      rule {
+        source_labels = ["__name__"]
+        regex         = "container_(cpu_usage_seconds_total|memory_usage_bytes|memory_working_set_bytes|memory_rss|memory_cache|memory_swap|network_receive_bytes_total|network_transmit_bytes_total|network_receive_packets_total|network_transmit_packets_total|fs_reads_bytes_total|fs_writes_bytes_total|spec_cpu_quota|spec_cpu_period|spec_memory_limit_bytes|last_seen)"
+        action        = "keep"
+      }
+    }
+
     prometheus.scrape "kubernetes_nodes_cadvisor" {
       targets    = discovery.relabel.kubernetes_nodes_cadvisor.output
-      forward_to = [prometheus.remote_write.default.receiver]
+      forward_to = [prometheus.relabel.cadvisor.receiver]
       job_name   = "kubernetes-nodes-cadvisor"
       scheme     = "https"
 
diff --git a/k8s-wheatley/alloy/configmap.yaml b/k8s-wheatley/alloy/configmap.yaml
index 991eb51..380a48a 100644
--- a/k8s-wheatley/alloy/configmap.yaml
+++ b/k8s-wheatley/alloy/configmap.yaml
@@ -5,7 +5,13 @@ metadata:
   name: alloy-config
 data:
   config.alloy: |-
-    prometheus.exporter.unix "node" {}
+    prometheus.exporter.unix "node" {
+      set_collectors = [
+        "cpu", "diskstats", "filesystem", "loadavg",
+        "meminfo", "netdev", "netstat", "os",
+        "pressure", "processes", "stat", "uname", "vmstat",
+      ]
+    }
 
     discovery.kubernetes "kubernetes_apiservers" {
       role = "endpoints"
@@ -152,6 +158,11 @@ data:
         source_labels = ["__meta_kubernetes_pod_node_name"]
         target_label  = "node"
       }
+
+      rule {
+        regex  = "pod_template_hash|controller_revision_hash|deployment_kubernetes_io_revision"
+        action = "labeldrop"
+      }
     }
 
     discovery.relabel "kubernetes_services" {
@@ -260,6 +271,11 @@ data:
         source_labels = ["__meta_kubernetes_pod_node_name"]
         target_label  = "node"
       }
+
+      rule {
+        regex  = "pod_template_hash|controller_revision_hash|deployment_kubernetes_io_revision"
+        action = "labeldrop"
+      }
     }
 
     discovery.relabel "pod_logs" {
@@ -369,9 +385,19 @@ data:
       }
     }
 
+    prometheus.relabel "cadvisor" {
+      forward_to = [prometheus.remote_write.default.receiver]
+
+      rule {
+        source_labels = ["__name__"]
+        regex         = "container_(cpu_usage_seconds_total|memory_usage_bytes|memory_working_set_bytes|memory_rss|memory_cache|memory_swap|network_receive_bytes_total|network_transmit_bytes_total|network_receive_packets_total|network_transmit_packets_total|fs_reads_bytes_total|fs_writes_bytes_total|spec_cpu_quota|spec_cpu_period|spec_memory_limit_bytes|last_seen)"
+        action        = "keep"
+      }
+    }
+
     prometheus.scrape "kubernetes_nodes_cadvisor" {
       targets    = discovery.relabel.kubernetes_nodes_cadvisor.output
-      forward_to = [prometheus.remote_write.default.receiver]
+      forward_to = [prometheus.relabel.cadvisor.receiver]
       job_name   = "kubernetes-nodes-cadvisor"
       scheme     = "https"
       clustering {