[prometheus-blackbox-exporter] Add values to configure HTTPS for self…

…monitor (#4434) Signed-off-by: Erwan Vallienne <[email protected]> Co-authored-by: Erwan Vallienne <[email protected]>
prometheus-community · Apr 10, 2024 · 02bbb18 · 02bbb18
1 parent 5e66b23
commit 02bbb18
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Prometheus Blackbox Exporter
 name: prometheus-blackbox-exporter
-version: 8.13.0
+version: 8.14.0
 appVersion: v0.24.0
 home: https://github.com/prometheus/blackbox_exporter
 sources:

diff --git a/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml b/charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml
@@ -15,10 +15,14 @@ spec:
   - path: {{ .Values.serviceMonitor.selfMonitor.path }}
     interval: {{ .Values.serviceMonitor.selfMonitor.interval }}
     scrapeTimeout: {{ .Values.serviceMonitor.selfMonitor.scrapeTimeout }}
-    scheme: http
+    scheme: {{ .Values.serviceMonitor.selfMonitor.scheme }}
     {{- with .Values.serviceMonitor.selfMonitor.port }}
     port: {{ . }}
     {{- end }}
+    {{- if .Values.serviceMonitor.selfMonitor.tlsConfig }}
+    tlsConfig:
+      {{- toYaml .Values.serviceMonitor.selfMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
     {{- if .Values.serviceMonitor.selfMonitor.additionalRelabeling }}
     relabelings:
       {{- toYaml .Values.serviceMonitor.selfMonitor.additionalRelabeling | nindent 6 }}
@@ -27,7 +31,11 @@ spec:
   - path: {{ .Values.configReloader.serviceMonitor.selfMonitor.path }}
     interval: {{ .Values.configReloader.serviceMonitor.selfMonitor.interval }}
     scrapeTimeout: {{ .Values.configReloader.serviceMonitor.selfMonitor.scrapeTimeout }}
-    scheme: http
+    scheme: {{ .Values.configReloader.serviceMonitor.selfMonitor.scheme }}
+    {{- if .Values.configReloader.serviceMonitor.selfMonitor.tlsConfig }}
+    tlsConfig:
+      {{- toYaml .Values.configReloader.serviceMonitor.selfMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
     {{- if .Values.configReloader.serviceMonitor.selfMonitor.additionalRelabeling }}
     relabelings:
       {{- toYaml .Values.configReloader.serviceMonitor.selfMonitor.additionalRelabeling | indent 6 }}

diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml
@@ -278,6 +278,8 @@ serviceMonitor:
     additionalRelabeling: []
     labels: {}
     path: /metrics
+    scheme: http
+    tlsConfig: {}
     interval: 30s
     scrapeTimeout: 30s
     ## Port can be defined by assigning a value for the port key below
@@ -469,5 +471,7 @@ configReloader:
       additionalMetricsRelabels: {}
       additionalRelabeling: []
       path: /metrics
+      scheme: http
+      tlsConfig: {}
       interval: 30s
       scrapeTimeout: 30s