From a747f04036852c3c378c592f21561bd64d064833 Mon Sep 17 00:00:00 2001
From: Raffael H <raffael@rokt.cloud>
Date: Mon, 16 Oct 2023 13:51:41 +0200
Subject: [PATCH] Update thanos sidecar and store config

---
 charts/user-monitoring/Chart.yaml                           | 2 +-
 charts/user-monitoring/templates/_user-prometheus.yaml      | 4 ++++
 .../templates/_user-thanos-query-deploy.yaml                | 6 ++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/user-monitoring/Chart.yaml b/charts/user-monitoring/Chart.yaml
index ce06d67..aadc7c1 100644
--- a/charts/user-monitoring/Chart.yaml
+++ b/charts/user-monitoring/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.5
+version: 0.2.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/user-monitoring/templates/_user-prometheus.yaml b/charts/user-monitoring/templates/_user-prometheus.yaml
index d8e5303..f6fc941 100644
--- a/charts/user-monitoring/templates/_user-prometheus.yaml
+++ b/charts/user-monitoring/templates/_user-prometheus.yaml
@@ -7,6 +7,10 @@ metadata:
     app.kubernetes.io/name: prometheus
   name: prometheus
 spec:
+  {{- if .Values.query.enabled }}
+  thanos:
+    image: quay.io/thanos/thanos:v0.32.3
+  {{- end }}
   scrapeInterval: 60s
   serviceAccountName: prometheus-{{ .Values.user }}
   serviceMonitorNamespaceSelector:
diff --git a/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml b/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml
index 1107865..3affd9b 100644
--- a/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml
+++ b/charts/user-monitoring/templates/_user-thanos-query-deploy.yaml
@@ -25,10 +25,8 @@ spec:
         - --query.replica-label=thanos_ruler_replica
         - --endpoint=prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
         - --endpoint=thanos-ruler-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
-        - --endpoint=kube-prometheus-stack-thanos-discovery.svc.cluster.local:10901
-        - --endpoint=dnssrv+_grpc.kube-prometheus-stack-thanos-discovery.monitoring.svc.cluster.local
-        - --endpoint=dnssrv+_grpc._tcp.kube-prometheus-stack-thanos-discovery.monitoring.svc.cluster.local
-        - --endpoint=dnssrv+prometheus-operated.monitoring.svc.cluster.local
+        - --store=dnssrv+prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local
+        - --store=dnssrv+_web._tcp.prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local
         - --store=dnssrv+_grpc._tcp.kube-prometheus-stack-thanos-discovery.monitoring.svc.cluster.local
         - --store.unhealthy-timeout=3d
         image: quay.io/thanos/thanos:v0.32.3