diff --git a/stable/prometheus-blackbox-exporter/Chart.yaml b/stable/prometheus-blackbox-exporter/Chart.yaml index b9f638b228..1382dc0e10 100644 --- 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: 3.3.0 +version: 3.4.0 appVersion: 0.15.1 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/stable/prometheus-blackbox-exporter/README.md b/stable/prometheus-blackbox-exporter/README.md index aabba50f14..2d15cc8f38 100644 --- a/stable/prometheus-blackbox-exporter/README.md +++ b/stable/prometheus-blackbox-exporter/README.md @@ -87,6 +87,10 @@ The following table lists the configurable parameters of the Blackbox-Exporter c | `serviceMonitor.targets.[].interval` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.interval }}` | | `serviceMonitor.targets.[].scrapeTimeout` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.scrateTimeout }}` | | `serviceMonitor.targets.[].module` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.module }}` | +| `prometheusRule.enabled` | Set this to true to create PrometheusRule for Prometheus operator | `false` | +| `prometheusRule.additionalLabels` | Additional labels that can be passed to PrometheusRule | `{}` | +| `prometheusRule.namespace` | Namespace where PrometheusRule resource should be created | | +| `prometheusRule.rules` | [PrometheusRule](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created | `[]` | | `strategy` | strategy used to replace old Pods with new ones | `{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/stable/prometheus-blackbox-exporter/templates/prometheusrule.yaml b/stable/prometheus-blackbox-exporter/templates/prometheusrule.yaml new file mode 100644 index 0000000000..77408be38f --- /dev/null +++ b/stable/prometheus-blackbox-exporter/templates/prometheusrule.yaml @@ -0,0 +1,23 @@ +{{- if .Values.prometheusRule.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ template "prometheus-blackbox-exporter.fullname" . }} + {{- with .Values.prometheusRule.namespace }} + namespace: {{ . }} + {{- end }} + labels: + app.kubernetes.io/name: {{ include "prometheus-blackbox-exporter.name" $ }} + app.kubernetes.io/instance: {{ $.Release.Name }} + app.kubernetes.io/managed-by: {{ $.Release.Service }} + helm.sh/chart: {{ include "prometheus-blackbox-exporter.chart" $ }} + {{- with .Values.prometheusRule.additionalLabels }} + {{- toYaml . | indent 4 }} + {{- end }} +spec: + {{- with .Values.prometheusRule.rules }} + groups: + - name: {{ template "prometheus-blackbox-exporter.name" $ }} + rules: {{ tpl (toYaml .) $ | nindent 8 }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/stable/prometheus-blackbox-exporter/values.yaml b/stable/prometheus-blackbox-exporter/values.yaml index 4c2851dd12..c0409be19e 100644 --- a/stable/prometheus-blackbox-exporter/values.yaml +++ b/stable/prometheus-blackbox-exporter/values.yaml @@ -127,3 +127,11 @@ serviceMonitor: # interval: 60s # Scraping interval. Overrides value set in `defaults` # scrapeTimeout: 60s # Scrape timeout. Overrides value set in `defaults` # module: http_2xx # Module used for scraping. Overrides value set in `defaults` + +## Custom PrometheusRules to be defined +## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions +prometheusRule: + enabled: false + additionalLabels: {} + namespace: "" + rules: []