[helm] Add ServiceMonitor relabel Configs (#8221)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
kubernetes · Jan 5, 2024 · d27d621 · d27d621
1 parent 0c5e89e
commit d27d621
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/charts/helm-chart/kubernetes-dashboard/Chart.yaml b/charts/helm-chart/kubernetes-dashboard/Chart.yaml
@@ -14,7 +14,7 @@
 
 apiVersion: v2
 name: kubernetes-dashboard
-version: 7.0.0-alpha1
+version: 7.0.0-alpha2
 appVersion: "v3.0.0-alpha0"
 description: General-purpose web UI for Kubernetes clusters
 keywords:

diff --git a/charts/helm-chart/kubernetes-dashboard/templates/extras/servicemonitor.yaml b/charts/helm-chart/kubernetes-dashboard/templates/extras/servicemonitor.yaml
@@ -32,10 +32,22 @@ metadata:
 spec:
   endpoints:
     - port: https
-      scheme: https
+      {{- with .Values.extras.serviceMonitor.scheme }}
+      scheme: {{ . }}
+      {{- end }}
+      {{- with .Values.extras.serviceMonitor.tlsConfig }}
       tlsConfig:
-        insecureSkipVerify: true
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       path: /metrics
+      {{- with .Values.extras.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.extras.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
   selector:
     matchLabels:
     {{ include "kubernetes-dashboard.labels" . | nindent 6 }}

diff --git a/charts/helm-chart/kubernetes-dashboard/values.yaml b/charts/helm-chart/kubernetes-dashboard/values.yaml
@@ -336,3 +336,13 @@ extras:
     labels: {}
     # Here annotations can be added to the serviceMonitor
     annotations: {}
+    # 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 connection scheme. Defaults to HTTPS.
+    scheme: https
+    # ServiceMonitor connection tlsConfig. Defaults to {insecureSkipVerify:true}.
+    tlsConfig:
+      insecureSkipVerify: true