From 3ec873f7c940483d2642dd548c1124086c37c213 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Wed, 12 Jun 2024 07:23:50 +0200 Subject: [PATCH] feat(prometheus-operator): change label for monitoring resources Signed-off-by: Nicolas Lamirault --- .../base/apigateway/contour/contour.yaml | 2 +- .../base/argo-cd/argo-cd/argo-cd.yaml | 12 ++++---- .../argo-cd/argo-rollouts/argo-rollouts.yaml | 2 +- .../cert-manager/cert-manager.yaml | 2 +- .../kubernetes/base/dns/blocky/blocky.yaml | 2 +- .../base/dns/external-dns/external-dns.yaml | 2 +- .../base/falco/falco/falco-exporter.yaml | 2 +- .../monitoring/helm-controller.yaml | 2 +- .../monitoring/kustomize-controller.yaml | 2 +- .../monitoring/notification-controller.yaml | 2 +- .../monitoring/source-controller.yaml | 2 +- .../base/identity/pomerium/pomerium.yaml | 2 +- .../ingress-controllers/contour/contour.yaml | 2 +- .../ingress-nginx/ingress-nginx.yaml | 4 +-- .../kubernetes/base/keda/keda/keda.yaml | 4 +-- .../aws-load-balancer-controller.yaml | 2 +- .../aws-node-termination-handler.yaml | 2 +- .../cluster-autoscaler.yaml | 4 +-- .../metrics-server/metrics-server.yaml | 2 +- .../base/kyverno/kyverno/kyverno.yaml | 2 +- .../policy-reporter/policy-reporter.yaml | 2 +- .../linkerd/linkerd-viz/serviceMonitor.yaml | 2 +- .../base/linkerd/linkerd/podMonitor.yaml | 6 ++-- .../base/linkerd/linkerd/serviceMonitor.yaml | 16 +++++------ .../base/logging/fluent-bit/fluent-bit.yaml | 2 +- .../base/logging/loki/loki-mixin.yaml | 2 +- .../kubernetes/base/logging/loki/loki.yaml | 2 +- .../base/logging/vector/vector.yaml | 2 +- .../blackbox-exporter/blackbox-exporter.yaml | 2 +- .../monitoring/blackbox-exporter/rules.yaml | 2 +- .../monitoring/grafana/grafana-mixin.yaml | 2 +- .../base/monitoring/grafana/grafana.yaml | 2 +- .../alertmanager-mixin.yaml | 2 +- .../kube-prometheus-stack/coredns-mixin.yaml | 2 +- .../kube-prometheus-stack.yaml | 28 +++++++++---------- .../kube-state-metrics-mixin.yaml | 2 +- .../node-exporter-mixin.yaml | 2 +- .../prometheus-mixin.yaml | 2 +- .../prometheus-operator-mixin.yaml | 2 +- .../base/monitoring/snmp-exporter/rules.yaml | 2 +- .../snmp-exporter/snmp-exporter.yaml | 2 +- .../base/monitoring/thanos/thanos-mixin.yaml | 2 +- .../base/monitoring/thanos/thanos.yaml | 14 +++++----- .../x509-certificate-exporter.yaml | 4 +-- .../base/multimedia/radarr/radarr.yaml | 4 +-- .../base/multimedia/sonarr/sonarr.yaml | 6 ++-- .../base/networking/speedtest/speedtest.yaml | 2 +- .../base/podinfo/podinfo/podinfo.yaml | 2 +- .../base/security/falco/falco-exporter.yaml | 2 +- .../kubernetes/base/storage/velero/rules.yaml | 2 +- .../base/storage/velero/serviceMonitor.yaml | 2 +- .../ingress-controllers/contour/contour.yaml | 2 +- .../homelab/apigateway/contour/contour.yaml | 2 +- 53 files changed, 93 insertions(+), 93 deletions(-) diff --git a/gitops/fluxcd/kubernetes/base/apigateway/contour/contour.yaml b/gitops/fluxcd/kubernetes/base/apigateway/contour/contour.yaml index 36b27c0c9f..8f9cab21a2 100644 --- 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 index c23a2864e0..3b473e4a53 100644 --- 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 index c3aee7fbf3..b9ba248050 100644 --- 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 index 00a08a4f62..81bf3dc934 100644 --- 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 index 39406b6e4d..c9bb1791a3 100644 --- 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 index a893cbe94d..c61aa98774 100644 --- 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 index 4004728a77..514f53b218 100644 --- 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 index 6a4570ca4b..0054a1a0ce 100644 --- 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 index da422e3b5b..153f97de2a 100644 --- 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 index 87f81b1078..f8a6403a3f 100644 --- 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 index d99b522a4c..99ed3cef05 100644 --- 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 index aacf07fa45..5c3a660043 100644 --- 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 index 77bddbdabd..c0b5303f4d 100644 --- 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 index 62f3b0cd2e..50ee32942f 100644 --- 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 index 40977ae4cd..28eb30097b 100644 --- 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/gitops/fluxcd/kubernetes/base/kube-system/aws-load-balancer-controller/aws-load-balancer-controller.yaml b/gitops/fluxcd/kubernetes/base/kube-system/aws-load-balancer-controller/aws-load-balancer-controller.yaml index 14aea3dbf4..563b907974 100644 --- a/gitops/fluxcd/kubernetes/base/kube-system/aws-load-balancer-controller/aws-load-balancer-controller.yaml +++ b/gitops/fluxcd/kubernetes/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/gitops/fluxcd/kubernetes/base/kube-system/aws-node-terminaison-handler/aws-node-termination-handler.yaml b/gitops/fluxcd/kubernetes/base/kube-system/aws-node-terminaison-handler/aws-node-termination-handler.yaml index b1f181ca01..ad3f188c96 100644 --- a/gitops/fluxcd/kubernetes/base/kube-system/aws-node-terminaison-handler/aws-node-termination-handler.yaml +++ b/gitops/fluxcd/kubernetes/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 index f4190e19b3..4def6da71d 100644 --- 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 index af306b86fd..1dcee3a8ab 100644 --- 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 index e4cd3eb8f0..ef07fe8368 100644 --- 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 index 781d14ea38..9dc16929f5 100644 --- 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 index 106a963b38..50bb204002 100644 --- 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 index 76daff3c24..8d78e06c8c 100644 --- 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 index e010f933da..a209730c09 100644 --- 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 index 9d0acd7dcc..c46c8fe366 100644 --- 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 index a7f73ed5e7..916791a1fc 100644 --- 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 index 2c6aa1de38..82a0e14ad2 100644 --- 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 index 71a0a887ad..8594bb532a 100644 --- 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 index c10418f5ec..0b100f08fa 100644 --- 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 index 02ce02d6f4..632dc4421c 100644 --- 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 index da83b985de..f17ec2d994 100644 --- 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 index 694d7747c2..d2cb2f98a8 100644 --- 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 index a9fb9ea447..88a14fb644 100644 --- 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 index 1cc406fe45..c7ace66af4 100644 --- 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 diff --git a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml index 53b831b5aa..0c37b7c6f7 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-prometheus-stack.yaml @@ -56,7 +56,7 @@ spec: api-troubleshooter: v0.40.0 # TODO: prefer xxxxx.serviceMonitor.additionalLabels for ServiceMonitor # https://github.com/prometheus-community/helm-charts/pull/2219 - monitoring: portefaix + prometheus.io/operator: portefaix defaultRules: create: false @@ -105,38 +105,38 @@ spec: enabled: true # serviceMonitor: # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubelet: enabled: true # serviceMonitor: # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubeControllerManager: enabled: true serviceMonitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix coreDns: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubeDns: enabled: true # serviceMonitor: # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubeEtcd: enabled: true serviceMonitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubeScheduler: enabled: false @@ -148,7 +148,7 @@ spec: serviceMonitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix kubeStateMetrics: enabled: true @@ -158,7 +158,7 @@ spec: monitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix nodeExporter: enabled: true @@ -168,7 +168,7 @@ spec: monitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix prometheusOperator: enabled: true @@ -212,18 +212,18 @@ spec: ruleNamespaceSelector: {} ruleSelector: matchLabels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceMonitorSelector: matchLabels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceMonitorNamespaceSelector: {} podMonitorSelector: matchLabels: - monitoring: portefaix + prometheus.io/operator: portefaix podMonitorNamespaceSelector: {} probeSelector: matchLabels: - monitoring: portefaix + prometheus.io/operator: portefaix probeNamespaceSelector: {} retention: 7d logLevel: info diff --git a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml index bd460f65bb..27161dd74a 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-mixin.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/kube-state-metrics-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 diff --git a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/node-exporter-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/node-exporter-mixin.yaml index 360a383031..a011aa5887 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/node-exporter-mixin.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/node-exporter-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/prometheus-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml index c444b97b0e..5849dc6f9e 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-mixin.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-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/prometheus-operator-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml index 8197a50ccc..937fc8a444 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-mixin.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/kube-prometheus-stack/prometheus-operator-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/snmp-exporter/rules.yaml b/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/rules.yaml index e9e59bc77b..68ec515976 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/rules.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/rules.yaml @@ -28,7 +28,7 @@ metadata: app.kubernetes.io/name: prometheus-snmp-exporter app.kubernetes.io/instance: prometheus-snmp-exporter app.kubernetes.io/version: "0.19.0" - monitoring: portefaix + prometheus.io/operator: portefaix portefaix.xyz/version: v0.54.0 spec: groups: diff --git a/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml b/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml index 55c2310759..7284af927b 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/snmp-exporter/snmp-exporter.yaml @@ -51,4 +51,4 @@ spec: serviceMonitor: enabled: true selector: - monitoring: portefaix + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos-mixin.yaml b/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos-mixin.yaml index 23d58573ce..b28bd9e68b 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos-mixin.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos-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/monitoring diff --git a/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos.yaml b/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos.yaml index c10275e237..509bb78f80 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/thanos/thanos.yaml @@ -68,7 +68,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix http: ingress: enabled: false @@ -88,7 +88,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceAccount: thanos-query queryFrontend: @@ -103,7 +103,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceAccount: thanos-query-frontend compact: @@ -118,7 +118,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceAccount: thanos-compact bucket: @@ -132,7 +132,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix serviceAccount: thanos-bucket rule: @@ -149,7 +149,7 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix sidecar: enable: true @@ -158,4 +158,4 @@ spec: serviceMonitor: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/monitoring/x509-certificate-exporter/x509-certificate-exporter.yaml b/gitops/fluxcd/kubernetes/base/monitoring/x509-certificate-exporter/x509-certificate-exporter.yaml index 5af4cd9a6f..7cfc9fce96 100644 --- a/gitops/fluxcd/kubernetes/base/monitoring/x509-certificate-exporter/x509-certificate-exporter.yaml +++ b/gitops/fluxcd/kubernetes/base/monitoring/x509-certificate-exporter/x509-certificate-exporter.yaml @@ -53,7 +53,7 @@ spec: prometheusServiceMonitor: create: true extraLabels: - monitoring: portefaix + prometheus.io/operator: portefaix prometheusRules: create: true readErrorsSeverity: warning @@ -61,4 +61,4 @@ spec: warningDaysLeft: 28 criticalDaysLeft: 14 extraLabels: - monitoring: portefaix + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/multimedia/radarr/radarr.yaml b/gitops/fluxcd/kubernetes/base/multimedia/radarr/radarr.yaml index a5f13efbbb..7a1d9e266f 100644 --- a/gitops/fluxcd/kubernetes/base/multimedia/radarr/radarr.yaml +++ b/gitops/fluxcd/kubernetes/base/multimedia/radarr/radarr.yaml @@ -59,11 +59,11 @@ spec: enabled: true serviceMonitor: labels: - monitoring: portefaix + prometheus.io/operator: portefaix prometheusRule: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix portefaix.xyz/version: v0.54.0 rules: - alert: RadarrDown diff --git a/gitops/fluxcd/kubernetes/base/multimedia/sonarr/sonarr.yaml b/gitops/fluxcd/kubernetes/base/multimedia/sonarr/sonarr.yaml index 65e888e501..2e41ec3e6f 100644 --- a/gitops/fluxcd/kubernetes/base/multimedia/sonarr/sonarr.yaml +++ b/gitops/fluxcd/kubernetes/base/multimedia/sonarr/sonarr.yaml @@ -59,11 +59,11 @@ spec: enabled: true serviceMonitor: labels: - monitoring: portefaix + prometheus.io/operator: portefaix prometheusRule: enabled: true labels: - monitoring: portefaix + prometheus.io/operator: portefaix portefaix.xyz/version: v0.54.0 rules: - alert: SonarrDown @@ -79,4 +79,4 @@ spec: podMonitor: enabled: true additionalLabels: - monitoring: portefaix + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/networking/speedtest/speedtest.yaml b/gitops/fluxcd/kubernetes/base/networking/speedtest/speedtest.yaml index 51d8f30448..124aeb8e14 100644 --- a/gitops/fluxcd/kubernetes/base/networking/speedtest/speedtest.yaml +++ b/gitops/fluxcd/kubernetes/base/networking/speedtest/speedtest.yaml @@ -64,4 +64,4 @@ spec: interval: 60m scrapeTimeout: 60s additionalLabels: - monitoring: portefaix + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/podinfo/podinfo/podinfo.yaml b/gitops/fluxcd/kubernetes/base/podinfo/podinfo/podinfo.yaml index 897498c6d4..bde3e9b9dc 100644 --- a/gitops/fluxcd/kubernetes/base/podinfo/podinfo/podinfo.yaml +++ b/gitops/fluxcd/kubernetes/base/podinfo/podinfo/podinfo.yaml @@ -60,4 +60,4 @@ spec: serviceMonitor: enabled: true additionalLabels: - release: kube-prometheus-stack + prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/base/security/falco/falco-exporter.yaml b/gitops/fluxcd/kubernetes/base/security/falco/falco-exporter.yaml index 9a5ad1004c..437c14322f 100644 --- a/gitops/fluxcd/kubernetes/base/security/falco/falco-exporter.yaml +++ b/gitops/fluxcd/kubernetes/base/security/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/storage/velero/rules.yaml b/gitops/fluxcd/kubernetes/base/storage/velero/rules.yaml index c5c5d4c28b..8dbe7eed7f 100644 --- a/gitops/fluxcd/kubernetes/base/storage/velero/rules.yaml +++ b/gitops/fluxcd/kubernetes/base/storage/velero/rules.yaml @@ -27,7 +27,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/storage/velero/serviceMonitor.yaml b/gitops/fluxcd/kubernetes/base/storage/velero/serviceMonitor.yaml index 33434ec04c..9b43a3dd87 100644 --- a/gitops/fluxcd/kubernetes/base/storage/velero/serviceMonitor.yaml +++ b/gitops/fluxcd/kubernetes/base/storage/velero/serviceMonitor.yaml @@ -25,7 +25,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: velero # helm.sh/chart: velero-2.14.0 - monitoring: portefaix + prometheus.io/operator: portefaix spec: podMetricsEndpoints: - interval: 30s diff --git a/gitops/fluxcd/kubernetes/overlays/k3s/cicd/ingress-controllers/contour/contour.yaml b/gitops/fluxcd/kubernetes/overlays/k3s/cicd/ingress-controllers/contour/contour.yaml index a111dc6d9e..6214e61159 100644 --- a/gitops/fluxcd/kubernetes/overlays/k3s/cicd/ingress-controllers/contour/contour.yaml +++ b/gitops/fluxcd/kubernetes/overlays/k3s/cicd/ingress-controllers/contour/contour.yaml @@ -52,4 +52,4 @@ spec: # prometheus: # serviceMonitor: # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix diff --git a/gitops/fluxcd/kubernetes/overlays/k3s/homelab/apigateway/contour/contour.yaml b/gitops/fluxcd/kubernetes/overlays/k3s/homelab/apigateway/contour/contour.yaml index defc931ce3..e472822849 100644 --- a/gitops/fluxcd/kubernetes/overlays/k3s/homelab/apigateway/contour/contour.yaml +++ b/gitops/fluxcd/kubernetes/overlays/k3s/homelab/apigateway/contour/contour.yaml @@ -61,4 +61,4 @@ spec: serviceMonitor: enabled: true # additionalLabels: - # monitoring: portefaix + # prometheus.io/operator: portefaix