From 226156b36a75e3bc2fa01d1291aed6511b2ed0f7 Mon Sep 17 00:00:00 2001
From: Thomas Philipona <thomas@acend.ch>
Date: Mon, 16 Oct 2023 22:30:44 +0200
Subject: [PATCH] Fix Thanos ruler

---
 charts/user-monitoring/templates/_user-am.yaml          | 3 ---
 charts/user-monitoring/templates/_user-thanosruler.yaml | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/charts/user-monitoring/templates/_user-am.yaml b/charts/user-monitoring/templates/_user-am.yaml
index c475831..dbba9fa 100644
--- a/charts/user-monitoring/templates/_user-am.yaml
+++ b/charts/user-monitoring/templates/_user-am.yaml
@@ -7,9 +7,6 @@ metadata:
     app.kubernetes.io/name: {{ .Values.user }}-alertmanager
   name: {{ .Values.user }}-alertmanager
 spec:
-  alertmanagerConfigNamespaceSelector:
-    matchNames:
-    - {{ .Values.user }}-monitoring
   alertmanagerConfigSelector:
     matchLabels:
       alertmanagerConfig: {{ .Values.user }}-alertmanager
diff --git a/charts/user-monitoring/templates/_user-thanosruler.yaml b/charts/user-monitoring/templates/_user-thanosruler.yaml
index 92ad8f7..7f19828 100644
--- a/charts/user-monitoring/templates/_user-thanosruler.yaml
+++ b/charts/user-monitoring/templates/_user-thanosruler.yaml
@@ -8,14 +8,16 @@ metadata:
   name: thanos-ruler
 spec:
   image: quay.io/thanos/thanos:v0.28.1
-  alertQueryUrl: {{ .Values.user }}-thanos-query.training.cluster.acend.ch
   evaluationInterval: 10s
   queryEndpoints:
-  - dnssrv+_http._tcp.thanos-querier.{{ .Values.user }}-monitoring.svc.cluster.local
+  - dnssrv+_http._tcp.thanos-query:10902
   ruleSelector: {}
   ruleNamespaceSelector:
     matchLabels:
       user: {{ .Values.user }}
+  alertmanagersConfig:
+    key: alertmanager-configs.yaml
+    name: thanosruler-alertmanager-config
 ---
 apiVersion: v1
 kind: Secret
@@ -26,5 +28,5 @@ stringData:
     alertmanagers:
     - static_configs:
       - "dnssrv+_web._tcp.alertmanager-operated.{{ .Values.user }}-monitoring.svc.cluster.local"
-      api_version: v2```
+      api_version: v2
 {{- end }}
\ No newline at end of file