Merge pull request #80 from nlamirault/fix/prometheus-operator

Fix labels used by Prometheus Operator to load
quickwit-oss · May 6, 2024 · 23fb69b · 23fb69b
2 parents ce94f7e + 7ca3922
commit 23fb69b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.5.14
+version: 0.5.15
 appVersion: "v0.8.1"
 keywords:
   - quickwit

diff --git a/charts/quickwit/templates/prometheusrule.yaml b/charts/quickwit/templates/prometheusrule.yaml
@@ -5,9 +5,12 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- with .Values.prometheusRule.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   groups:
     - name: {{ include "quickwit.fullname" . }}
       rules:
-        {{- toYaml .Values.prometheusRules.rules | nindent 8 }} 
+        {{- toYaml .Values.prometheusRule.rules | nindent 8 }} 
 {{- end }} 
diff --git a/charts/quickwit/templates/servicemonitor.yaml b/charts/quickwit/templates/servicemonitor.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- with .Values.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
     - path: /metrics

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
@@ -414,6 +414,8 @@ serviceMonitor:
 # Prometheus Operator alertmanager alerts
 prometheusRule:
   enabled: false
+  # -- Additional labels to add to PrometheusRule resources
+  additionalLabels: {}
   rules: []
   #  - alert: Example
   #    expr: metric == 1