Allow custom module for blackbox service monitor

This allows to set a custom module name for the ServiceMonitor monitor to target. Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
helm · Jul 31, 2019 · bede329 · bede329
1 parent 8b3382c
commit bede329
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/stable/prometheus-blackbox-exporter/Chart.yaml b/stable/prometheus-blackbox-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Prometheus Blackbox Exporter
 name: prometheus-blackbox-exporter
-version: 1.0.0
+version: 1.1.0
 appVersion: 0.14.0
 home: https://github.com/prometheus/blackbox_exporter
 sources:

diff --git a/stable/prometheus-blackbox-exporter/README.md b/stable/prometheus-blackbox-exporter/README.md
@@ -75,6 +75,7 @@ The following table lists the configurable parameters of the Blackbox-Exporter c
 | `serviceMonitor.enabled`               | If true, a ServiceMonitor CRD is created for a prometheus operator | `false`      |
 | `serviceMonitor.labels`                | Labels for prometheus operator                    | `{}`                          |
 | `serviceMonitor.interval`              | Interval for prometheus operator endpoint         | `30s`                         |
+| `serviceMonitor.module`                | The module that blackbox will use if serviceMonitor is enabled | `http_2xx` |
 | `serviceMonitor.url`                   | The URL that blackbox will scrape if serviceMonitor is enabled | `http://example.com/healthz` |
 | `serviceMonitor.urlHumanReadable`      | Optional human readable URL that will appear in Prometheus / AlertManager | `nil` |
 

diff --git a/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml b/stable/prometheus-blackbox-exporter/templates/servicemonitor.yaml
@@ -20,7 +20,7 @@ spec:
     scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
     params:
       module:
-      - http_2xx
+      - {{ .Values.serviceMonitor.module }}
       target:
       - {{ .Values.serviceMonitor.url }}
     metricRelabelings:

diff --git a/stable/prometheus-blackbox-exporter/values.yaml b/stable/prometheus-blackbox-exporter/values.yaml
@@ -89,6 +89,7 @@ serviceMonitor:
   labels: {}
   interval: 30s
   scrapeTimeout: 30s
+  module: http_2xx
   # The URL that blackbox will scrape
   url: http://example.com/healthz
   # Optional human readable URL that will appear in Prometheus / AlertManager