From 786da51e0b6ea2bae42804d1519d164ab46a8bfd Mon Sep 17 00:00:00 2001
From: Vincent SELLIER <vincent.sellier@softwareheritage.org>
Date: Tue, 12 Mar 2024 10:58:53 +0100
Subject: [PATCH] gitlab-staging: Remove the namespace alert filtering
The prometheus operator and the helm chart need to be upgraded
to add the option to disable the namespace filtering.
It's upgraded to the same version deployed in the rancher aks cluster.
The CRD will be manually deployed
Related to swh/infra/sysadm-environment#5036
Related to swh/infra/sysadm-environment#5281
---
.../gitlab-staging/prometheus-application.yaml | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/argocd-configuration/applications/gitlab-staging/prometheus-application.yaml b/argocd-configuration/applications/gitlab-staging/prometheus-application.yaml
index c736a43..076d772 100644
--- a/argocd-configuration/applications/gitlab-staging/prometheus-application.yaml
+++ b/argocd-configuration/applications/gitlab-staging/prometheus-application.yaml
@@ -10,7 +10,7 @@ spec:
source:
chart: kube-prometheus-stack
repoURL: https://prometheus-community.github.io/helm-charts
- targetRevision: 43.1.0
+ targetRevision: 45.10.1
helm:
releaseName: gitlab-staging-prometheus # must match the application name (https://github.com/argoproj/argo-cd/issues/2871)
# The crds must be manually applied to avoid the following error:
@@ -21,13 +21,10 @@ spec:
skipCrds: true
values: |
alertmanager:
- enabled: true # Temporary for tests
- defaultRules:
- rules:
- kubeControllerManager: false
- kubeProxy: false
- kubeSchedulerRecording: false
- kubeStateMetrics: false
+ enabled: true
+ alertmanagerSpec:
+ alertmanagerConfigMatcherStrategy:
+ type: None
grafana:
enabled: true # Temporary before federation with pergamon
service:
--
GitLab