diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml index a6a6a86..bb69b6b 100644 --- a/charts/quickwit/Chart.yaml +++ b/charts/quickwit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: quickwit description: Open-Source & Cloud-Native Log Management at any scale. type: application -version: 0.1.13 +version: 0.2.0 appVersion: "v0.4.0" keywords: - quickwit diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl index ec38fde..815c321 100644 --- a/charts/quickwit/templates/_helpers.tpl +++ b/charts/quickwit/templates/_helpers.tpl @@ -40,6 +40,9 @@ helm.sh/chart: {{ include "quickwit.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- if .Values.additionalLabels }} +{{ toYaml .Values.additionalLabels }} +{{- end }} {{- end }} {{/* diff --git a/charts/quickwit/templates/servicemonitor.yaml b/charts/quickwit/templates/servicemonitor.yaml index 492b047..d77fe73 100644 --- 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.prometheus.monitor.additionalLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: endpoints: - path: /metrics diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml index b55950b..48bfafd 100644 --- a/charts/quickwit/values.yaml +++ b/charts/quickwit/values.yaml @@ -12,6 +12,10 @@ imagePullSecrets: [] nameOverride: "" fullnameOverride: "" +# -- Additional labels to add to all resources +additionalLabels: {} + # app: quickwit + serviceAccount: # Specifies whether a service account should be created create: true @@ -322,6 +326,8 @@ config: # Prometheus metrics serviceMonitor: enabled: false + # -- Additional labels to add to monitoring resources + additionalLabels: {} interval: 60s scrapeTimeout: 10s metricRelabelings: []