[prometheus-blackbox-exporter] Add selfMonitor support (#2471)

* [prometheus-blackbox-exporter] Add selfMonitor support Signed-off-by: Pavel Storozhenko <storozhenkopf@gmail.com> * [prometheus-blackbox-exporter] Add selfMonitor support Signed-off-by: Pavel Storozhenko <storozhenkopf@gmail.com> * [prometheus-blackbox-exporter] Change values structure Signed-off-by: Pavel Storozhenko <storozhenkopf@gmail.com> * [prometheus-blackbox-exporter] Fix yaml linting Signed-off-by: Pavel Storozhenko <storozhenkopf@gmail.com> Signed-off-by: Pavel Storozhenko <storozhenkopf@gmail.com>
prometheus-community · Sep 22, 2022 · cc3507f · cc3507f
1 parent d5d699c
commit cc3507f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 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: 7.0.1
+version: 7.1.0
 appVersion: 0.22.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
@@ -0,0 +1,30 @@
+{{- if .Values.serviceMonitor.selfMonitor.enabled }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "prometheus-blackbox-exporter.fullname" $ }}
+  namespace: {{ template "prometheus-blackbox-exporter.namespace" $ }}
+  labels:
+    {{- include "prometheus-blackbox-exporter.labels" $ | nindent 4 }}
+    {{- if or $.Values.serviceMonitor.selfMonitor.labels .labels }}
+    {{- toYaml (.labels | default $.Values.serviceMonitor.selfMonitor.labels) | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+  - path: /metrics
+    interval: {{ .interval | default $.Values.serviceMonitor.selfMonitor.interval }}
+    scrapeTimeout: {{ .scrapeTimeout | default $.Values.serviceMonitor.selfMonitor.scrapeTimeout }}
+    scheme: http
+    relabelings:
+{{- if concat (.additionalRelabeling | default list) $.Values.serviceMonitor.selfMonitor.additionalRelabeling }}
+{{ toYaml (concat (.additionalRelabeling | default list) $.Values.serviceMonitor.selfMonitor.additionalRelabeling) | indent 6 }}
+{{- end }}
+  jobLabel: "{{ $.Release.Name }}"
+  selector:
+    matchLabels:
+      {{- include "prometheus-blackbox-exporter.selectorLabels" $ | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+      - {{ template "prometheus-blackbox-exporter.namespace" $ }}
+{{- end }}
diff --git a/charts/prometheus-blackbox-exporter/values.yaml b/charts/prometheus-blackbox-exporter/values.yaml
@@ -214,7 +214,18 @@ replicas: 1
 
 serviceMonitor:
   ## If true, a ServiceMonitor CRD is created for a prometheus operator
-  ## https://github.com/coreos/prometheus-operator
+  ## https://github.com/coreos/prometheus-operator for blackbox-exporter itself
+  ##
+  selfMonitor:
+    enabled: false
+    additionalMetricsRelabels: {}
+    additionalRelabeling: []
+    labels: {}
+    interval: 30s
+    scrapeTimeout: 30s
+
+  ## If true, a ServiceMonitor CRD is created for a prometheus operator
+  ## https://github.com/coreos/prometheus-operator for each target
   ##
   enabled: false