Skip to content

Commit c881d2b

Browse files
duncan485dbakker11mblaschke
authored
[charts/azure-metrics-exporter] add additional labels and annotations (#36)
* add additional labels and annotations to azure-metrics-exporter * bump chart version * Update Chart.yaml * Update servicemonitor.metricprobe.yaml * Update servicemonitor.yaml --------- Co-authored-by: dbakker11 <dbakker11@lely.com> Co-authored-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent a9e3278 commit c881d2b

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

charts/azure-metrics-exporter/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: azure-metrics-exporter
33
type: application
44
description: A Helm chart for azure-metrics-exporter
55
home: https://github.com/webdevops/azure-metrics-exporter
6-
version: 1.0.9
6+
version: 1.0.10
77
# renovate: image=webdevops/azure-metrics-exporter
88
appVersion: 23.7.0
99
keywords:

charts/azure-metrics-exporter/templates/prometheus/servicemonitor.metricprobe.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@
55
apiVersion: monitoring.coreos.com/v1
66
kind: ServiceMonitor
77
metadata:
8+
{{- with .Values.prometheus.monitor.additionalAnnotations }}
9+
annotations: {{- toYaml . | nindent 4 }}
10+
{{- end }}
811
name: {{ template "azure-metrics-exporter.fullname" $root }}-{{ .name }}
912
namespace: {{ template "azure-metrics-exporter.namespace" $root }}
10-
labels: {{ include "azure-metrics-exporter.labels" $root | indent 4 }}
13+
labels:
14+
{{ include "azure-metrics-exporter.labels" $root | indent 4 }}
15+
{{- with .Values.prometheus.monitor.additionalLabels }}
16+
{{- toYaml . | nindent 4 }}
17+
{{- end }}
1118
spec:
1219
jobLabel: {{ default "app.kubernetes.io/name" $monitorDefaults.jobLabel }}
1320
{{ include "servicemonitor.scrapeLimits" $monitorDefaults | indent 2 }}

charts/azure-metrics-exporter/templates/prometheus/servicemonitor.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
6+
{{- with .Values.prometheus.monitor.additionalAnnotations }}
7+
annotations: {{- toYaml . | nindent 4 }}
8+
{{- end }}
69
name: {{ template "azure-metrics-exporter.fullname" . }}
710
namespace: {{ template "azure-metrics-exporter.namespace" . }}
811
labels: {{ include "azure-metrics-exporter.labels" . | indent 4 }}
12+
{{- with .Values.prometheus.monitor.additionalLabels }}
13+
{{- toYaml . | nindent 4 }}
14+
{{- end }}
915
spec:
1016
jobLabel: {{ default "app.kubernetes.io/name" .Values.prometheus.monitor.jobLabel }}
1117
{{ include "servicemonitor.scrapeLimits" .Values.prometheus.monitor | indent 2 }}

charts/azure-metrics-exporter/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ prometheus:
136136

137137
jobLabel: ""
138138

139+
additionalAnnotations: {}
140+
additionalLabels: {}
141+
139142
scheme: http
140143
basicAuth: {}
141144
bearerTokenFile:

0 commit comments

Comments
 (0)