Add cluster label step for PodMonitors and ServiceMonitors (#64)

* Add cluster label step for PodMonitors and ServiceMonitors Signed-off-by: Pete Wall <[email protected]>
grafana · Aug 15, 2023 · 71426aa · 71426aa
1 parent b11fa14
commit 71426aa
Show file tree

Hide file tree

Showing 19 changed files with 153 additions and 3 deletions.
diff --git a/charts/k8s-monitoring/Chart.lock b/charts/k8s-monitoring/Chart.lock
@@ -21,4 +21,4 @@ dependencies:
   repository: https://opencost.github.io/opencost-helm-chart
   version: 1.18.0
 digest: sha256:5959a6de6ae065b5cf28b3b5ee98bed157852a3b22b53c1ea0d519d2c62f31cc
-generated: "2023-08-14T16:10:03.931068-05:00"
+generated: "2023-08-15T12:28:04.411024-05:00"
diff --git a/charts/k8s-monitoring/Chart.yaml b/charts/k8s-monitoring/Chart.yaml
@@ -3,7 +3,7 @@ name: k8s-monitoring
 description: A Helm chart for gathering, scraping, and forwarding Kubernetes infrastructure metrics and logs to a Grafana Stack.
 type: application
 
-version: 0.1.0
+version: 0.1.1
 appVersion: 1.2.0
 icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
 maintainers:

diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md
@@ -1,6 +1,6 @@
 # k8s-monitoring
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
 
 A Helm chart for gathering, scraping, and forwarding Kubernetes infrastructure metrics and logs to a Grafana Stack.
 

diff --git a/charts/k8s-monitoring/templates/agent_config/_pod_monitors.txt b/charts/k8s-monitoring/templates/agent_config/_pod_monitors.txt
@@ -1,6 +1,11 @@
 {{ define "agent.config.pod_monitors" }}
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }}
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 {{ end }}
diff --git a/charts/k8s-monitoring/templates/agent_config/_service_monitors.txt b/charts/k8s-monitoring/templates/agent_config/_service_monitors.txt
@@ -1,6 +1,11 @@
 {{ define "agent.config.service_monitors" }}
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }}
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 {{ end }}
diff --git a/examples/custom-allow-lists/metrics.river b/examples/custom-allow-lists/metrics.river
@@ -243,11 +243,21 @@ prometheus.scrape "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "custom-allow-lists-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "custom-allow-lists-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/custom-allow-lists/output.yaml b/examples/custom-allow-lists/output.yaml
@@ -321,11 +321,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "custom-allow-lists-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "custom-allow-lists-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/custom-config/metrics.river b/examples/custom-config/metrics.river
@@ -252,11 +252,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "custom-config-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "custom-config-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/custom-config/output.yaml b/examples/custom-config/output.yaml
@@ -345,11 +345,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "custom-config-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "custom-config-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/default-values/metrics.river b/examples/default-values/metrics.river
@@ -252,11 +252,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "default-values-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "default-values-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/default-values/output.yaml b/examples/default-values/output.yaml
@@ -345,11 +345,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "default-values-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "default-values-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/metrics-only/metrics.river b/examples/metrics-only/metrics.river
@@ -252,11 +252,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "metrics-only-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "metrics-only-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/metrics-only/output.yaml b/examples/metrics-only/output.yaml
@@ -330,11 +330,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "metrics-only-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "metrics-only-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/openshift-compatible/metrics.river b/examples/openshift-compatible/metrics.river
@@ -253,11 +253,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "openshift-compatible-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "openshift-compatible-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/openshift-compatible/output.yaml b/examples/openshift-compatible/output.yaml
@@ -315,11 +315,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "openshift-compatible-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "openshift-compatible-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/otel-collector/metrics.river b/examples/otel-collector/metrics.river
@@ -252,11 +252,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "otel-collector-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "otel-collector-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/otel-collector/output.yaml b/examples/otel-collector/output.yaml
@@ -345,11 +345,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "otel-collector-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "otel-collector-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 

diff --git a/examples/windows-exporter/metrics.river b/examples/windows-exporter/metrics.river
@@ -321,11 +321,21 @@ prometheus.relabel "opencost" {
 
 // PodMonitor
 prometheus.operator.podmonitors "pod_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "default-values-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 
 // ServiceMonitor
 prometheus.operator.servicemonitors "service_monitors" {
+  rule {
+    source_labels = ["__name__"]
+    replacement   = "default-values-test"
+    target_label  = "cluster"
+  }
   forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
 }
 

diff --git a/examples/windows-exporter/output.yaml b/examples/windows-exporter/output.yaml
@@ -451,11 +451,21 @@ data:
 
     // PodMonitor
     prometheus.operator.podmonitors "pod_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "default-values-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }
 
     // ServiceMonitor
     prometheus.operator.servicemonitors "service_monitors" {
+      rule {
+        source_labels = ["__name__"]
+        replacement   = "default-values-test"
+        target_label  = "cluster"
+      }
       forward_to = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
     }