deleted: services/monitoring/deploy/alloy/alloy-loki-examples copy.config

deleted:    services/monitoring/deploy/alloy/alloy-prometheus-examples.config
modified:   services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml

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

@@ -27,6 +27,14 @@ alloy:
         role = "pod"
       }
 
+      // ============================================
+      // Discovery: Kubernetes - services
+      // used by:
+      // - loki kubernetes kube state metrics
+      // ============================================
+      discovery.kubernetes "kube_services" {
+        role = "service"
+      }
       
       // ============================================
       // Discovery: Kubernetes - endpoints
@@ -34,7 +42,7 @@ alloy:
       // - loki kubernetes kube state metrics
       // ============================================
       discovery.kubernetes "kube_endpoints" {
-        role = "endpoint"
+        role = "endpoints"
       }
 
       // ============================================
@@ -44,6 +52,10 @@ alloy:
         endpoint {
           url = env("PROMETHEUS_URL")
         }
+        external_labels = {
+          cluster = env("CLUSTER_NAME"),
+          zone    = env("ZONE"),
+        }
       }
 
       // ============================================
@@ -181,20 +193,14 @@ alloy:
         }
 
         rule {
-            source_labels = ["__meta_kubernetes_endpoint_node_name"]
-            target_label  = "node"
-        }
-        
-        rule {
-          source_labels = ["__meta_kubernetes_endpoint_node_name"]
-          target_label = "host"
+          target_label = "cluster"
+          replacement  = env("CLUSTER_NAME")
         }
 
         rule {
-          source_labels = ["__meta_kubernetes_endpoint_node_name"]
-          target_label = "nodename"
+          target_label = "zone"
+          replacement  = env("ZONE")
         }
-
       }
 
 
@@ -245,8 +251,110 @@ alloy:
           replacement  = "/metrics/cadvisor"
           target_label = "__metrics_path__"
         }
+
+        rule {
+          target_label = "cluster"
+          replacement  = env("CLUSTER_NAME")
+        }
+
+        rule {
+          target_label = "zone"
+          replacement  = env("ZONE")
+        }
       }
- 
+
+      // ============================================
+      // API Server discovery
+      // ============================================
+
+      discovery.relabel "apiserver" {
+        targets = discovery.kubernetes.kube_services.targets
+
+        rule {
+          source_labels = ["__meta_kubernetes_service_name"]
+          regex         = "kubernetes"
+          action        = "keep"
+        }
+     
+        rule {
+          target_label = "cluster"
+          replacement  = env("CLUSTER_NAME")
+        }
+
+        rule {
+          target_label = "zone"
+          replacement  = env("ZONE")
+        }
+      }
+
+      prometheus.scrape "apiserver" {
+        job_name = "integrations/kubernetes/apiserver"
+        targets  = discovery.relabel.apiserver.output
+
+        scheme = "https"
+        metrics_path = "/metrics"
+
+        tls_config {
+          server_name          = "kubernetes"
+          ca_file              = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+          insecure_skip_verify = true
+        }
+
+        bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token"
+
+        forward_to = [prometheus.remote_write.prometheus_srv.receiver]
+      }
+      
+      // ============================================
+      // CoreDNS discovery (ENDPOINTS)
+      // ============================================
+
+      discovery.relabel "coredns" {
+        targets = discovery.kubernetes.kube_endpoints.targets
+
+        rule {
+          source_labels = ["__meta_kubernetes_service_name"]
+          regex         = "(kube-dns|coredns)"
+          action        = "keep"
+        }
+
+        rule {
+          source_labels = ["__meta_kubernetes_endpoint_node_name"]
+          target_label  = "node"
+        }
+
+        rule {
+          action        = "replace"
+          target_label  = "__address__"
+          replacement   = "$__meta_kubernetes_endpoint_address:9153"
+        }
+
+        rule {
+          target_label = "cluster"
+          replacement  = env("CLUSTER_NAME")
+        }
+
+        rule {
+          target_label = "zone"
+          replacement  = env("ZONE")
+        }
+
+      }
+
+      // ============================================
+      // CoreDNS scrape
+      // ============================================
+      prometheus.scrape "coredns" {
+        job_name = "integrations/kubernetes/coredns"
+        targets  = discovery.relabel.coredns.output
+
+        scheme = "http"
+        metrics_path = "/metrics"
+
+        forward_to = [prometheus.remote_write.prometheus_srv.receiver]
+      }
+
+
   extraEnv:
 
     - name: CLUSTER_NAME