Merge pull request #484 from ishuar/feat/allow-relabeling-on-servicem…

…onitor [velero]: feature to allow relabelings in `serviceMonitor`
vmware-tanzu · Aug 7, 2023 · 7d95633 · 7d95633
2 parents a9dac3e + 42cd48d
commit 7d95633
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.11.1
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart for velero
 name: velero
-version: 4.2.0
+version: 4.3.0
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

diff --git a/charts/velero/templates/servicemonitor.yaml b/charts/velero/templates/servicemonitor.yaml
@@ -33,6 +33,12 @@ spec:
     {{- if .Values.metrics.serviceMonitor.scheme }}
     scheme: {{ .Values.metrics.serviceMonitor.scheme }}
     {{- end }}
+    {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
+    metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.relabelings }}
+    relabelings: {{ toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
+    {{- end }}
     {{- if .Values.metrics.serviceMonitor.tlsConfig }}
     tlsConfig:
       {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 6 }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -182,6 +182,12 @@ metrics:
     enabled: false
     annotations: {}
     additionalLabels: {}
+
+    # metrics.serviceMonitor.metricRelabelings Specify Metric Relabelings to add to the scrape endpoint
+    # ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    # metricRelabelings: []
+    # metrics.serviceMonitor.relabelings [array] Prometheus relabeling rules
+    # relabelings: []
     # ServiceMonitor namespace. Default to Velero namespace.
     # namespace:
     # ServiceMonitor connection scheme. Defaults to HTTP.