modified: services/monitoring/deploy/alloy/alloy-prometheus-examples.config

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

services/monitoring/deploy/alloy/alloy-prometheus-examples.config

@@ -83,3 +83,64 @@
       // }
 
 
+      // ============================================
+      // Prometheus: prometheus_srv
+      // ============================================
+
+      prometheus.remote_write "prometheus_srv" {
+  
+        endpoint {
+          url = env("PROMETHEUS_URL")
+        }
+
+        // global labels
+        external_labels = {
+          cluster = env("CLUSTER_NAME"),
+          zone    = env("ZONE"),
+        }
+
+      }
+
+      // ===============================================================================
+      // prometheus / Metrics - Node exporter
+      // Requirements: 
+      //  - discovery.relabel - node_exporter
+      // ===============================================================================
+      prometheus.scrape "node_exporter" {
+        job_name   = "integrations/kubernetes/node-exporter"
+        targets    = discovery.relabel.node_exporter.output
+        scheme     = "http"
+        forward_to = [prometheus.remote_write.prometheus_srv.receiver]
+      }
+
+
+      discovery.relabel "node_exporter" {
+        targets = discovery.kubernetes.kube_pods.targets
+
+        rule {
+          source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+          regex         = "node-exporter|prometheus-node-exporter"
+          action        = "keep"
+        }
+
+        rule {
+          source_labels = ["__meta_kubernetes_pod_container_port_number"]
+          regex         = "9100"
+          action        = "keep"
+        }
+
+        rule {
+          source_labels = ["__meta_kubernetes_pod_node_name"]
+          target_label  = "node"
+        }
+
+        rule {
+          source_labels = ["__meta_kubernetes_pod_node_name"]
+          target_label  = "nodename"
+        }
+
+        rule {
+          source_labels = ["__meta_kubernetes_pod_node_name"]
+          target_label  = "instance"
+        }
+      }

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

@@ -148,69 +148,6 @@ alloy:
       }
 
 
-      // ============================================
-      // Prometheus: prometheus_srv
-      // ============================================
-
-      prometheus.remote_write "prometheus_srv" {
-  
-        endpoint {
-          url = env("PROMETHEUS_URL")
-        }
-
-        // global labels
-        external_labels = {
-          cluster = env("CLUSTER_NAME"),
-          zone    = env("ZONE"),
-        }
-
-      }
-
-      // ===============================================================================
-      // prometheus / Metrics - Node exporter
-      // Requirements: 
-      //  - discovery.relabel - node_exporter
-      // ===============================================================================
-      prometheus.scrape "node_exporter" {
-        job_name   = "integrations/kubernetes/node-exporter"
-        targets    = discovery.relabel.node_exporter.output
-        scheme     = "http"
-        forward_to = [prometheus.remote_write.prometheus_srv.receiver]
-      }
-
-
-      discovery.relabel "node_exporter" {
-        targets = discovery.kubernetes.kube_pods.targets
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
-          regex         = "node-exporter|prometheus-node-exporter"
-          action        = "keep"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_container_port_number"]
-          regex         = "9100"
-          action        = "keep"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_node_name"]
-          target_label  = "node"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_node_name"]
-          target_label  = "nodename"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_node_name"]
-          target_label  = "instance"
-        }
-      }
-
-
       // ===============================================================================
       // prometheus / Metrics - Scrape kube_state_metrics
       // Requirements: 
@@ -244,23 +181,23 @@ alloy:
           target_label = "host"
         }
 
-        rule {
+        // rule {
-          source_labels = ["host"]
+        //   source_labels = ["host"]
-          target_label = "nodename"
+        //   target_label = "nodename"
-        }
+        // }
 
       }
 
 
       // ===============================================================================
-      // prometheus / Metrics - Scrape Kubernetes nodes / cAdvisor
+      // Scrape Kubernetes pods containers metrics / cAdvisor
       // Requirements: 
-      //  - discovery.relabel - kube_node_metrics (cAdviser)
+      //  - discovery.relabel - kube_pods_metrics (cAdviser)
       // ===============================================================================
 
       prometheus.scrape "cadvisor" {
         job_name = "integrations/kubernetes/cadvisor"
-        targets  = discovery.relabel.kube_node_metrics.output
+        targets  = discovery.relabel.kube_pods_metrics.output
         scheme   = "https"
 
         tls_config {
@@ -277,7 +214,7 @@ alloy:
 
 
       // ===========================================================
-      // Discovery:relabel: Kube_node_metrics (cAdviser)
+      // Discovery:relabel: kube_pods_metrics (cAdviser)
       // Requirements: 
       //  - discovery.kubernetes.role.node: kube_nodes
       // ===========================================================
@@ -296,10 +233,10 @@ alloy:
           target_label = "host"
         }
 
-        rule {
+        // rule {
-          source_labels = ["host"]
+        //   source_labels = ["host"]
-          target_label = "nodename"
+        //   target_label = "nodename"
-        }
+        // }
 
         rule {
           replacement  = "/metrics/cadvisor"