Revert "feat(prometheus): use PrometheusSpec CRD to add the cluster label (#5…" (#5898)

This reverts commit 5e01cda.

Author: nlamirault

gitops/argocd/charts/database/dragonfly-operator/values-talos-homelab.yaml

@@ -24,8 +24,8 @@ dragonfly-operator:
         cpu: 10m
         memory: 50Mi
 
-  # serviceMonitor:
-  #   relabelings:
-  #   - action: replace
-  #     replacement: portefaix-talos-homelab
-  #     targetLabel: cluster
+  serviceMonitor:
+    relabelings:
+    - action: replace
+      replacement: portefaix-talos-homelab
+      targetLabel: cluster

gitops/argocd/charts/dora/dora-github/values-talos-homelab.yaml

@@ -23,8 +23,8 @@ opentelemetry-collector:
     requests:
       memory: 100Mi
 
-  # serviceMonitor:
-  #   relabelings:
-  #   - action: replace
-  #     replacement: portefaix-talos-homelab
-  #     targetLabel: cluster
+  serviceMonitor:
+    relabelings:
+    - action: replace
+      replacement: portefaix-talos-homelab
+      targetLabel: cluster

gitops/argocd/charts/identity/dex/values-talos-homelab.yaml

@@ -82,11 +82,11 @@ dex:
   - secretRef:
       name: dex-credentials
 
-  # serviceMonitor:
-  #   relabelings:
-  #   - action: replace
-  #     replacement: portefaix-talos-homelab
-  #     targetLabel: cluster
+  serviceMonitor:
+    relabelings:
+    - action: replace
+      replacement: portefaix-talos-homelab
+      targetLabel: cluster
 
   resources:
     limits:

gitops/argocd/charts/kube-system/cilium/values-talos-homelab.yaml

@@ -90,18 +90,16 @@ cilium:
           sourceLabels:
           - __meta_kubernetes_pod_node_name
           targetLabel: node
-        # - action: replace
-        #   replacement: portefaix-talos-homelab
-        #   targetLabel: cluster
-
-    # relay:
-    #   prometheus:
-    #     serviceMonitor:
-    #       relabelings:
-    #       - action: replace
-    #         replacement: portefaix-talos-homelab
-    #         targetLabel: cluster
-
+        - action: replace
+          replacement: portefaix-talos-homelab
+          targetLabel: cluster
+    relay:
+      prometheus:
+        serviceMonitor:
+          relabelings:
+          - action: replace
+            replacement: portefaix-talos-homelab
+            targetLabel: cluster
     ui:
       frontend:
         resources:
@@ -128,12 +126,12 @@ cilium:
     nodeSelector:
       kubernetes.io/os: linux
       portefaix.xyz/master: "true"
-    # prometheus:
-    #   serviceMonitor:
-    #     relabelings:
-    #     - action: replace
-    #       replacement: portefaix-talos-homelab
-    #       targetLabel: cluster
+    prometheus:
+      serviceMonitor:
+        relabelings:
+        - action: replace
+          replacement: portefaix-talos-homelab
+          targetLabel: cluster
 
   prometheus:
     serviceMonitor:
@@ -143,6 +141,6 @@ cilium:
         sourceLabels:
         - __meta_kubernetes_pod_node_name
         targetLabel: node
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster

gitops/argocd/charts/monitoring/kube-prometheus-stack/values-talos-homelab.yaml

@@ -105,18 +105,18 @@ kube-prometheus-stack:
           memory: 32Mi
       nodeSelector:
         portefaix.xyz/master: "true"
-    # serviceMonitor:
-    #   relabelings:
-    #   - action: replace
-    #     replacement: portefaix-talos-homelab
-    #     targetLabel: cluster
+    serviceMonitor:
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
 
   kubeApiServer:
     serviceMonitor:
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -140,16 +140,16 @@ kube-prometheus-stack:
       - targetLabel: instance
         sourceLabels:
         - "node"
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       relabelings:
       - action: replace
         sourceLabels: [__metrics_path__]
         targetLabel: metrics_path
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -174,10 +174,10 @@ kube-prometheus-stack:
     serviceMonitor:
       https: true
       insecureSkipVerify: true
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -200,10 +200,10 @@ kube-prometheus-stack:
       port: 2381
       targetPort: 2381
     serviceMonitor:
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -228,10 +228,10 @@ kube-prometheus-stack:
     serviceMonitor:
       https: true
       insecureSkipVerify: true
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -256,10 +256,10 @@ kube-prometheus-stack:
       selector:
         k8s-app: kube-proxy
     serviceMonitor:
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -276,10 +276,10 @@ kube-prometheus-stack:
 
   coreDns:
     serviceMonitor:
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -296,10 +296,10 @@ kube-prometheus-stack:
 
   kubeDns:
     serviceMonitor:
-      # relabelings:
-      # - action: replace
-      #   replacement: portefaix-talos-homelab
-      #   targetLabel: cluster
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
       metricRelabelings:
       - action: drop
         regex: (apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket|apiserver_request_sli_duration_seconds_bucket)
@@ -318,9 +318,9 @@ kube-prometheus-stack:
     prometheus:
       monitor:
         relabelings:
-        # - action: replace
-        #   replacement: portefaix-talos-homelab
-        #   targetLabel: cluster
+        - action: replace
+          replacement: portefaix-talos-homelab
+          targetLabel: cluster
         - targetLabel: "instance"
           sourceLabels:
           - "__meta_kubernetes_pod_node_name"
@@ -336,9 +336,9 @@ kube-prometheus-stack:
     prometheus:
       monitor:
         relabelings:
-        # - action: replace
-        #   replacement: portefaix-talos-homelab
-        #   targetLabel: cluster
+        - action: replace
+          replacement: portefaix-talos-homelab
+          targetLabel: cluster
         - targetLabel: "instance"
           sourceLabels:
           - "__meta_kubernetes_pod_node_name"
@@ -368,11 +368,11 @@ kube-prometheus-stack:
           memory: 30Mi
     nodeSelector:
       portefaix.xyz/master: "true"
-    # serviceMonitor:
-    #   relabelings:
-    #   - action: replace
-    #     replacement: portefaix-talos-homelab
-    #     targetLabel: cluster
+    serviceMonitor:
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
 
   prometheus:
     ingress:
@@ -384,16 +384,14 @@ kube-prometheus-stack:
       path: /
       pathType: Prefix
 
-    # serviceMonitor:
-    #   relabelings:
-    #   - action: replace
-    #     replacement: portefaix-talos-homelab
-    #     targetLabel: cluster
+    serviceMonitor:
+      relabelings:
+      - action: replace
+        replacement: portefaix-talos-homelab
+        targetLabel: cluster
 
     prometheusSpec:
       retention: 2d
-      externalLabels:
-        cluster: portefaix-talos-homelab
       resources:
         limits:
           # cpu: 800m

gitops/argocd/charts/observability/grafana/values-talos-homelab.yaml

@@ -49,6 +49,7 @@ observability:
   cluster_name: "portefaix-talos-homelab"
 
 grafana:
+
   persistence:
     type: statefulset
     enabled: true
@@ -99,8 +100,8 @@ grafana:
         cpu: 10m
         memory: 50Mi
 
-  # serviceMonitor:
-  #   relabelings:
-  #   - action: replace
-  #     replacement: portefaix-talos-homelab
-  #     targetLabel: cluster
+  serviceMonitor:
+    relabelings:
+    - action: replace
+      replacement: portefaix-talos-homelab
+      targetLabel: cluster