Merge branch 'main' into helmHookAnnotations

vmware-tanzu · Aug 7, 2023 · 3c8cfb9 · 3c8cfb9
2 parents 824f2a6 + 7d95633
commit 3c8cfb9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
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
@@ -186,6 +186,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.