update relablings for servicemonitor resource

jenkinsci · May 27, 2022 · 154b7f2 · 154b7f2
1 parent 55d0047
commit 154b7f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.1.1
+version: 4.1.2
 appVersion: 2.332.3
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:

diff --git a/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml b/charts/jenkins/templates/jenkins-controller-servicemonitor.yaml
@@ -27,7 +27,12 @@ spec:
     port: http
     path: {{ .Values.controller.jenkinsUriPrefix }}{{ .Values.controller.prometheus.scrapeEndpoint }}
   {{- if .Values.controller.prometheus.metricRelabelings }}
-    metricRelabelings: {{ .Values.controller.prometheus.metricRelabelings }}
+    metricRelabelings:
+{{- toYaml .Values.controller.prometheus.metricRelabelings | trim | nindent 6 }}
+  {{- end  }}
+  {{- if .Values.controller.prometheus.relabelings }}
+    relabelings:
+{{- toYaml .Values.controller.prometheus.relabelings | trim | nindent 6 }}
   {{- end  }}
   jobLabel: {{ template "jenkins.fullname" . }}
   namespaceSelector:

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -524,6 +524,10 @@ controller:
     alertingrules: []
     # Set a custom namespace where to deploy PrometheusRule resource
     prometheusRuleNamespace: ""
+    # Set relabling for metrics
+    metricRelabelings: []
+    # Set relablings
+    relabelings: []
 
   # Can be used to disable rendering controller test resources when using helm template
   testEnabled: true