diff --git a/charts/kyuubi/templates/kyuubi-alert.yaml b/charts/kyuubi/templates/kyuubi-alert.yaml index a1a7537b3..d9c2ee6e6 100644 --- a/charts/kyuubi/templates/kyuubi-alert.yaml +++ b/charts/kyuubi/templates/kyuubi-alert.yaml @@ -22,6 +22,9 @@ metadata: name: {{ .Release.Name }} labels: {{- include "kyuubi.labels" . | nindent 4 }} + {{- if .Values.metrics.prometheusRule.labels }} + {{- toYaml .Values.metrics.prometheusRule.labels | nindent 4 }} + {{- end }} spec: groups: {{- toYaml .Values.metrics.prometheusRule.groups | nindent 4 }} diff --git a/charts/kyuubi/templates/kyuubi-podmonitor.yaml b/charts/kyuubi/templates/kyuubi-podmonitor.yaml index ad154af27..6517b950a 100644 --- a/charts/kyuubi/templates/kyuubi-podmonitor.yaml +++ b/charts/kyuubi/templates/kyuubi-podmonitor.yaml @@ -23,7 +23,7 @@ metadata: labels: {{- include "kyuubi.labels" . | nindent 4 }} {{- if .Values.metrics.podMonitor.labels }} - {{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }} + {{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }} {{- end }} spec: selector: diff --git a/charts/kyuubi/templates/kyuubi-servicemonitor.yaml b/charts/kyuubi/templates/kyuubi-servicemonitor.yaml index a75da50e3..744b750d5 100644 --- a/charts/kyuubi/templates/kyuubi-servicemonitor.yaml +++ b/charts/kyuubi/templates/kyuubi-servicemonitor.yaml @@ -23,7 +23,7 @@ metadata: labels: {{- include "kyuubi.labels" . | nindent 4 }} {{- if .Values.metrics.serviceMonitor.labels }} - {{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }} + {{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }} {{- end }} spec: selector: diff --git a/charts/kyuubi/templates/kyuubi-statefulset.yaml b/charts/kyuubi/templates/kyuubi-statefulset.yaml index 62a0b02eb..57706d23a 100644 --- a/charts/kyuubi/templates/kyuubi-statefulset.yaml +++ b/charts/kyuubi/templates/kyuubi-statefulset.yaml @@ -41,7 +41,7 @@ spec: checksum/conf: {{ include (print $.Template.BasePath "/kyuubi-configmap.yaml") . | sha256sum }} checksum/conf-hadoop: {{ include (print $.Template.BasePath "/kyuubi-hadoop-configmap.yaml") . | sha256sum }} {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} spec: {{- with .Values.imagePullSecrets }} diff --git a/charts/kyuubi/values.yaml b/charts/kyuubi/values.yaml index 5a5640a29..67ce3c7fe 100644 --- a/charts/kyuubi/values.yaml +++ b/charts/kyuubi/values.yaml @@ -346,3 +346,5 @@ metrics: enabled: false # Content of Prometheus rule file groups: [] + # Additional labels to be used to make PrometheusRule discovered by Prometheus + labels: {}