diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index ab90a9fb17..5dbddbe2e8 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 9.3.2 +version: 9.3.3 appVersion: 2.13.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/templates/_helpers.tpl b/stable/prometheus/templates/_helpers.tpl index 8ea012479e..295aa01c50 100644 --- a/stable/prometheus/templates/_helpers.tpl +++ b/stable/prometheus/templates/_helpers.tpl @@ -6,6 +6,13 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "prometheus.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{/* Create unified labels for prometheus components */}} @@ -15,7 +22,7 @@ release: {{ .Release.Name }} {{- end -}} {{- define "prometheus.common.metaLabels" -}} -chart: {{ .Chart.Name }}-{{ .Chart.Version }} +chart: {{ template "prometheus.chart" . }} heritage: {{ .Release.Service }} {{- end -}}