From c396e3cd7e3df2dfefca75b1bf48ee6cfcee0388 Mon Sep 17 00:00:00 2001 From: Bernhard Bucher Date: Thu, 10 Mar 2022 19:56:01 +0100 Subject: [PATCH] [bitnami/jenkins] fix: jenkins metrics service and servicemonitor (#9368) --- bitnami/jenkins/Chart.yaml | 2 +- bitnami/jenkins/templates/servicemonitor.yaml | 2 +- bitnami/jenkins/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index 232c8c992a..e1d6d305ab 100644 --- a/bitnami/jenkins/Chart.yaml +++ b/bitnami/jenkins/Chart.yaml @@ -26,4 +26,4 @@ name: jenkins sources: - https://github.com/bitnami/bitnami-docker-jenkins - https://jenkins.io/ -version: 9.0.6 +version: 9.0.7 diff --git a/bitnami/jenkins/templates/servicemonitor.yaml b/bitnami/jenkins/templates/servicemonitor.yaml index 3d486af6a8..b0b1ca5ed6 100644 --- a/bitnami/jenkins/templates/servicemonitor.yaml +++ b/bitnami/jenkins/templates/servicemonitor.yaml @@ -15,7 +15,7 @@ metadata: {{- if .Values.metrics.serviceMonitor.labels }} {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.labels "context" $) | nindent 4 }} {{- end }} - app.kubernetes.io/component: metrics + app.kubernetes.io/component: metrics {{- if .Values.commonAnnotations }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 82a69bd53e..50d797eb88 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -631,7 +631,7 @@ metrics: ## annotations: prometheus.io/scrape: "true" - prometheus.io/port: "{{ .Values.metrics.service.ports.http }}" + prometheus.io/port: "{{ .Values.metrics.service.port }}" ## Prometheus Service Monitor ## ref: https://github.com/coreos/prometheus-operator ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint