Change from kube-prom-stack-{cluster} to prometheus-collector service label

Author: Utwo

apps/playground-sandbox/common/values.yaml

@@ -2,7 +2,7 @@ backend:
   serviceMonitor:
     enabled: true
     additionalLabels:
-      release: kube-prometheus-stack-k3d-apps
+      release: prometheus-collector
   env:
     - name: SANDBOX_NODE_LABEL
       value: "default"

infra/argo-apps/argo-rollouts.yaml

@@ -33,12 +33,6 @@ spec:
           helm:
             valueFiles:
               - $myRepo/infra/argo-rollouts/values.yaml
-            valuesObject:
-              controller:
-                metrics:
-                  serviceMonitor:
-                    additionalLabels:
-                      release: "kube-prometheus-stack-{{.name}}"
           repoURL: https://argoproj.github.io/argo-helm
           targetRevision: 2.38.2
       destination:

infra/argo-apps/ingress-nginx.yaml

@@ -31,7 +31,7 @@ spec:
                 enabled: true
                 serviceMonitor:
                   additionalLabels:
-                    release: "kube-prometheus-stack-{{.values.clusterName}}"
+                    release: "prometheus-collector"
                   enabled: true
               # -- Will add custom configuration options to Nginx https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/
               config:

infra/argo-rollouts/values.yaml

@@ -4,5 +4,7 @@ controller:
     enabled: true
     serviceMonitor:
       enabled: true
+      additionalLabels:
+        release: "prometheus-collector"
 dashboard:
   enabled: true

infra/argocd/metrics/argocd-metrics.yaml

@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   name: argocd-metrics
   labels:
-    release: kube-prometheus-stack-k3d-control
+    release: prometheus-collector
 spec:
   selector:
     matchLabels:

infra/argocd/metrics/argocd-repo-server-metrics.yaml

@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   name: argocd-repo-server-metrics
   labels:
-    release: kube-prometheus-stack-k3d-control
+    release: prometheus-collector
 spec:
   selector:
     matchLabels:

infra/argocd/metrics/argocd-server-metrics.yaml

@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   name: argocd-server-metrics
   labels:
-    release: kube-prometheus-stack-k3d-control
+    release: prometheus-collector
 spec:
   selector:
     matchLabels:

monitoring/alertmanager/service-monitor.yaml

@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   name: alertmanager
   labels:
-    release: kube-prometheus-stack-k3d-control
+    release: prometheus-collector
 spec:
   endpoints:
     - interval: 30s

monitoring/opentelemetry-collector/helm-chart-values/values.yaml

@@ -98,4 +98,4 @@ ingress:
 serviceMonitor:
   enabled: true
   extraLabels:
-    release: kube-prometheus-stack-k3s-control
+    release: prometheus-collector

monitoring/opentelemetry-kube-stack/helm-chart-values/clusters/all/values.yaml

@@ -19,9 +19,13 @@ collectors:
       allocationStrategy: per-node
       prometheusCR:
         enabled: true
-        podMonitorSelector: {}
+        podMonitorSelector:
+          matchLabels:
+            release: prometheus-collector
         scrapeInterval: "30s"
-        serviceMonitorSelector: {}
+        serviceMonitorSelector:
+          matchLabels:
+            release: prometheus-collector
     ports:
       - appProtocol: grpc
         name: otlp-grpc