feat(prometheus-operator): change label for monitoring resources

Signed-off-by: Nicolas Lamirault <[email protected]>
portefaix · Jun 12, 2024 · 3ec873f · 3ec873f
1 parent ed66e70
commit 3ec873f
Show file tree

Hide file tree

Showing 53 changed files with 93 additions and 93 deletions.
diff --git a/gitops/fluxcd/kubernetes/base/apigateway/contour/contour.yaml b/gitops/fluxcd/kubernetes/base/apigateway/contour/contour.yaml
@@ -53,4 +53,4 @@ spec:
       serviceMonitor:
         enabled: true
         # additionalLabels:
-        #   monitoring: portefaix
+        #   prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/argo-cd/argo-cd/argo-cd.yaml b/gitops/fluxcd/kubernetes/base/argo-cd/argo-cd/argo-cd.yaml
@@ -70,7 +70,7 @@ spec:
           enabled: true
           interval: 30s
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
         rules:
           enabled: false
           spec:
@@ -97,10 +97,10 @@ spec:
                 The application [{{`{{$labels.name}}`}} has not been synchronized for over 12 hours which means that the state
                 of this cloud has drifted away from the state inside Git.
           selector:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
           namespace: monitoring
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
 
     dex:
       enabled: true
@@ -116,7 +116,7 @@ spec:
           enabled: true
           interval: 30s
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
 
     # TODO: ArgoCD: timeout with Redis and RepoServer
     # labels: kind/bug, priority/high, lifecycle/frozen, area/kubernetes
@@ -150,7 +150,7 @@ spec:
           enabled: true
           interval: 30s
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
       ingress:
         enabled: false
       config:
@@ -174,4 +174,4 @@ spec:
           enabled: true
           interval: 30s
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/argo-cd/argo-rollouts/argo-rollouts.yaml b/gitops/fluxcd/kubernetes/base/argo-cd/argo-rollouts/argo-rollouts.yaml
@@ -61,7 +61,7 @@ spec:
         serviceMonitor:
           enabled: true
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
 
     containerSecurityContext:
       allowPrivilegeEscalation: false

diff --git a/gitops/fluxcd/kubernetes/base/cert-manager/cert-manager/cert-manager.yaml b/gitops/fluxcd/kubernetes/base/cert-manager/cert-manager/cert-manager.yaml
@@ -44,4 +44,4 @@ spec:
       servicemonitor:
         enabled: true
         labels:
-          monitoring: portefaix
+          prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/dns/blocky/blocky.yaml b/gitops/fluxcd/kubernetes/base/dns/blocky/blocky.yaml
@@ -42,7 +42,7 @@ spec:
       serviceMonitor:
         interval: 30s
         labels:
-          monitoring: portefaix
+          prometheus.io/operator: portefaix
       prometheusRule:
         enabled: true
         rules:

diff --git a/gitops/fluxcd/kubernetes/base/dns/external-dns/external-dns.yaml b/gitops/fluxcd/kubernetes/base/dns/external-dns/external-dns.yaml
@@ -41,4 +41,4 @@ spec:
       serviceMonitor:
         enabled: true
         selector:
-          monitoring: portefaix
+          prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/falco/falco/falco-exporter.yaml b/gitops/fluxcd/kubernetes/base/falco/falco/falco-exporter.yaml
@@ -51,4 +51,4 @@ spec:
     serviceMonitor:
       enabled: true
       additionalLabels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/flux-system/monitoring/helm-controller.yaml b/gitops/fluxcd/kubernetes/base/flux-system/monitoring/helm-controller.yaml
@@ -19,7 +19,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   labels:
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: helm-controller
   namespace: flux-system
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/flux-system/monitoring/kustomize-controller.yaml b/gitops/fluxcd/kubernetes/base/flux-system/monitoring/kustomize-controller.yaml
@@ -19,7 +19,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   labels:
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: kustomize-controller
   namespace: flux-system
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/flux-system/monitoring/notification-controller.yaml b/gitops/fluxcd/kubernetes/base/flux-system/monitoring/notification-controller.yaml
@@ -19,7 +19,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   labels:
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: notification-controller
   namespace: flux-system
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/flux-system/monitoring/source-controller.yaml b/gitops/fluxcd/kubernetes/base/flux-system/monitoring/source-controller.yaml
@@ -19,7 +19,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   labels:
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: source-controller
   namespace: flux-system
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/identity/pomerium/pomerium.yaml b/gitops/fluxcd/kubernetes/base/identity/pomerium/pomerium.yaml
@@ -40,4 +40,4 @@ spec:
     serviceMonitor:
       enabled: true
       labels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/ingress-controllers/contour/contour.yaml b/gitops/fluxcd/kubernetes/base/ingress-controllers/contour/contour.yaml
@@ -52,4 +52,4 @@ spec:
       serviceMonitor:
         enabled: true
         # additionalLabels:
-        #   monitoring: portefaix
+        #   prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml b/gitops/fluxcd/kubernetes/base/ingress-controllers/ingress-nginx/ingress-nginx.yaml
@@ -45,11 +45,11 @@ spec:
         serviceMonitor:
           enabled: true
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
         prometheusRule:
           enabled: true
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
           rules:
           - alert: NGINXConfigFailed
             expr: count(nginx_ingress_controller_config_last_reload_successful == 0) > 0

diff --git a/gitops/fluxcd/kubernetes/base/keda/keda/keda.yaml b/gitops/fluxcd/kubernetes/base/keda/keda/keda.yaml
@@ -51,10 +51,10 @@ spec:
         podMonitor:
           enabled: true
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
       operator:
         enabled: true
         podMonitor:
           enabled: true
           additionalLabels:
-            monitoring: portefaix
+            prometheus.io/operator: portefaix
diff --git a/...ubernetes/base/kube-system/aws-load-balancer-controller/aws-load-balancer-controller.yaml b/...ubernetes/base/kube-system/aws-load-balancer-controller/aws-load-balancer-controller.yaml
@@ -60,7 +60,7 @@ spec:
     # serviceMonitor:
     #   enabled: true
     #   additionalLabels:
-    #     monitoring: portefaix
+    #     prometheus.io/operator: portefaix
 
     serviceAccount:
       name: aws-load-balancer-controller

diff --git a/...ubernetes/base/kube-system/aws-node-terminaison-handler/aws-node-termination-handler.yaml b/...ubernetes/base/kube-system/aws-node-terminaison-handler/aws-node-termination-handler.yaml
@@ -67,4 +67,4 @@ spec:
     # podMonitor:
     #   enabled: true
     #   labels:
-    #     monitoring: portefaix
+    #     prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/kube-system/cluster-autoscaler/cluster-autoscaler.yaml b/gitops/fluxcd/kubernetes/base/kube-system/cluster-autoscaler/cluster-autoscaler.yaml
@@ -38,9 +38,9 @@ spec:
       enabled: true
       namespace: monitoring
       selector:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
     prometheusRule:
       enabled: true
       additionalLabels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
       namespace: monitoring
diff --git a/gitops/fluxcd/kubernetes/base/kube-system/metrics-server/metrics-server.yaml b/gitops/fluxcd/kubernetes/base/kube-system/metrics-server/metrics-server.yaml
@@ -39,6 +39,6 @@ spec:
     serviceMonitor:
       enabled: true
       additionalLabels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
       interval: 1m
       scrapeTimeout: 30s
diff --git a/gitops/fluxcd/kubernetes/base/kyverno/kyverno/kyverno.yaml b/gitops/fluxcd/kubernetes/base/kyverno/kyverno/kyverno.yaml
@@ -55,4 +55,4 @@ spec:
     serviceMonitor:
       enabled: true
       additionalLabels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/kyverno/policy-reporter/policy-reporter.yaml b/gitops/fluxcd/kubernetes/base/kyverno/policy-reporter/policy-reporter.yaml
@@ -44,7 +44,7 @@ spec:
       namespace: kyverno
       serviceMonitor:
         labels:
-          monitoring: portefaix
+          prometheus.io/operator: portefaix
       grafana:
         dashboards:
           label: grafana-dashboard

diff --git a/gitops/fluxcd/kubernetes/base/linkerd/linkerd-viz/serviceMonitor.yaml b/gitops/fluxcd/kubernetes/base/linkerd/linkerd-viz/serviceMonitor.yaml
@@ -26,7 +26,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-viz-metrics-api
   namespace: linkerd-viz
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/linkerd/linkerd/podMonitor.yaml b/gitops/fluxcd/kubernetes/base/linkerd/linkerd/podMonitor.yaml
@@ -26,7 +26,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-controller
   namespace: linkerd
 spec:
@@ -58,7 +58,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-service-mirror
   namespace: linkerd
 spec:
@@ -89,7 +89,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-proxy
   namespace: linkerd
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/linkerd/linkerd/serviceMonitor.yaml b/gitops/fluxcd/kubernetes/base/linkerd/linkerd/serviceMonitor.yaml
@@ -26,7 +26,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-web
   namespace: linkerd
 spec:
@@ -47,7 +47,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-sp-validator
   namespace: linkerd
 spec:
@@ -68,7 +68,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-controller-api
   namespace: linkerd
 spec:
@@ -89,7 +89,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-identity
   namespace: linkerd
 spec:
@@ -110,7 +110,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-proxy-injector
   namespace: linkerd
 spec:
@@ -131,7 +131,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-tap
   namespace: linkerd
 spec:
@@ -152,7 +152,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-dst
   namespace: linkerd
 spec:
@@ -173,7 +173,7 @@ metadata:
     app.kubernetes.io/managed-by: Kustomize
     # renovate: registryUrl=https://helm.linkerd.io/stable
     app.kubernetes.io/version: 2.11.0
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
   name: linkerd-proxies
   namespace: linkerd
 spec:

diff --git a/gitops/fluxcd/kubernetes/base/logging/fluent-bit/fluent-bit.yaml b/gitops/fluxcd/kubernetes/base/logging/fluent-bit/fluent-bit.yaml
@@ -43,4 +43,4 @@ spec:
     serviceMonitor:
       enabled: true
       selector:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/logging/loki/loki-mixin.yaml b/gitops/fluxcd/kubernetes/base/logging/loki/loki-mixin.yaml
@@ -51,6 +51,6 @@ spec:
     additionalLabels:
       portefaix.xyz/version: v0.54.0
       app: kube-prometheus-stack
-      monitoring: portefaix
+      prometheus.io/operator: portefaix
     grafana:
       folder: /tmp/dashboards/logging
diff --git a/gitops/fluxcd/kubernetes/base/logging/loki/loki.yaml b/gitops/fluxcd/kubernetes/base/logging/loki/loki.yaml
@@ -45,4 +45,4 @@ spec:
     serviceMonitor:
       enabled: true
       additionalLabels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/logging/vector/vector.yaml b/gitops/fluxcd/kubernetes/base/logging/vector/vector.yaml
@@ -47,7 +47,7 @@ spec:
       podMonitor:
         enabled: true
         # additionalLabels:
-        #   monitoring: portefaix
+        #   prometheus.io/operator: portefaix
 
     # https://vector.dev/docs/reference/sinks/
     sinks:

diff --git a/gitops/fluxcd/kubernetes/base/monitoring/blackbox-exporter/blackbox-exporter.yaml b/gitops/fluxcd/kubernetes/base/monitoring/blackbox-exporter/blackbox-exporter.yaml
@@ -73,4 +73,4 @@ spec:
       enabled: true
       defaults:
         labels:
-          monitoring: portefaix
+          prometheus.io/operator: portefaix
diff --git a/gitops/fluxcd/kubernetes/base/monitoring/blackbox-exporter/rules.yaml b/gitops/fluxcd/kubernetes/base/monitoring/blackbox-exporter/rules.yaml
@@ -28,7 +28,7 @@ metadata:
     app.kubernetes.io/part-of: prometheus-blackbox-exporter
     app.kubernetes.io/version: "0.19.0"
     app.kubernetes.io/managed-by: Helm
-    monitoring: portefaix
+    prometheus.io/operator: portefaix
     portefaix.xyz/version: v0.54.0
 spec:
   groups:

diff --git a/gitops/fluxcd/kubernetes/base/monitoring/grafana/grafana-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/grafana/grafana-mixin.yaml
@@ -51,6 +51,6 @@ spec:
     additionalLabels:
       portefaix.xyz/version: v0.54.0
       app: kube-prometheus-stack
-      monitoring: portefaix
+      prometheus.io/operator: portefaix
     grafana:
       folder: monitoring
diff --git a/gitops/fluxcd/kubernetes/base/monitoring/grafana/grafana.yaml b/gitops/fluxcd/kubernetes/base/monitoring/grafana/grafana.yaml
@@ -61,7 +61,7 @@ spec:
     serviceMonitor:
       enabled: true
       labels:
-        monitoring: portefaix
+        prometheus.io/operator: portefaix
 
     ingress:
       enabled: false

diff --git a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/alertmanager-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/alertmanager-mixin.yaml
@@ -51,6 +51,6 @@ spec:
     additionalLabels:
       portefaix.xyz/version: v0.54.0
       app: kube-prometheus-stack
-      monitoring: portefaix
+      prometheus.io/operator: portefaix
     grafana:
       folder: monitoring
diff --git a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/coredns-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/coredns-mixin.yaml
@@ -51,6 +51,6 @@ spec:
     additionalLabels:
       portefaix.xyz/version: v0.54.0
       app: kube-prometheus-stack
-      monitoring: portefaix
+      prometheus.io/operator: portefaix
     grafana:
       folder: kubernetes