From 37598939ec5991ec537e05e7fbdc510748bce2bf Mon Sep 17 00:00:00 2001 From: Christian Kotzbauer Date: Sun, 22 Dec 2019 12:17:17 +0100 Subject: [PATCH] [bitnami/prometheus-operator]: Make ServiceMonitor of Prometheus and Alertmanager optional Signed-off-by: Christian Kotzbauer --- bitnami/prometheus-operator/Chart.yaml | 2 +- bitnami/prometheus-operator/README.md | 2 ++ .../templates/alertmanager/servicemonitor.yaml | 2 +- .../templates/prometheus/servicemonitor.yaml | 2 +- bitnami/prometheus-operator/values-production.yaml | 6 ++++++ bitnami/prometheus-operator/values.yaml | 6 ++++++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bitnami/prometheus-operator/Chart.yaml b/bitnami/prometheus-operator/Chart.yaml index cb4e26d34..dd7fbbed0 100644 --- a/bitnami/prometheus-operator/Chart.yaml +++ b/bitnami/prometheus-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.34.0 description: The Prometheus Operator for Kubernetes provides easy monitoring definitions for Kubernetes services and deployment and management of Prometheus instances. name: prometheus-operator -version: 0.7.4 +version: 0.7.5 keywords: - prometheus - alertmanager diff --git a/bitnami/prometheus-operator/README.md b/bitnami/prometheus-operator/README.md index d13838841..4d40410f5 100644 --- a/bitnami/prometheus-operator/README.md +++ b/bitnami/prometheus-operator/README.md @@ -163,6 +163,7 @@ The following table lists the configurable parameters of the Prometheus Operator | `prometheus.service.loadBalancerIP` | `loadBalancerIP` if service type is `LoadBalancer` | `nil` | | `prometheus.service.loadBalancerSourceRanges` | Address that are allowed when svc is `LoadBalancer` | `[]` | | `prometheus.service.annotations` | Additional annotations for Prometheus service | `{}` | +| `prometheus.serviceMonitor.enabled` | Creates a ServiceMonitor to monitor Prometheus itself | `true` | | `prometheus.serviceMonitor.interval` | Scrape interval (use by default, falling back to Prometheus' default) | `nil` | | `prometheus.serviceMonitor.metricRelabelings` | Metric relabeling | `[]` | | `prometheus.serviceMonitor.relabelings` | Relabel configs | `[]` | @@ -235,6 +236,7 @@ The following table lists the configurable parameters of the Prometheus Operator | `alertmanager.service.loadBalancerIP` | `loadBalancerIP` if service type is `LoadBalancer` | `nil` | | `alertmanager.service.loadBalancerSourceRanges` | Address that are allowed when svc is `LoadBalancer` | `[]` | | `alertmanager.service.annotations` | Additional annotations for Alertmanager service | `{}` | +| `alertmanager.serviceMonitor.enabled` | Creates a ServiceMonitor to monitor Alertmanager | `true` | | `alertmanager.serviceMonitor.interval` | Scrape interval (use by default, falling back to Prometheus' default) | `nil` | | `alertmanager.serviceMonitor.metricRelabelings` | Metric relabeling | `[]` | | `alertmanager.serviceMonitor.relabelings` | Relabel configs | `[]` | diff --git a/bitnami/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/bitnami/prometheus-operator/templates/alertmanager/servicemonitor.yaml index 85d75bbab..d25458244 100644 --- a/bitnami/prometheus-operator/templates/alertmanager/servicemonitor.yaml +++ b/bitnami/prometheus-operator/templates/alertmanager/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if .Values.alertmanager.enabled }} +{{- if and .Values.alertmanager.enabled .Values.alertmanager.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/bitnami/prometheus-operator/templates/prometheus/servicemonitor.yaml b/bitnami/prometheus-operator/templates/prometheus/servicemonitor.yaml index 59a524b01..3e78b8c64 100644 --- a/bitnami/prometheus-operator/templates/prometheus/servicemonitor.yaml +++ b/bitnami/prometheus-operator/templates/prometheus/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.prometheus.enabled }} +{{- if and .Values.prometheus.enabled .Values.prometheus.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/bitnami/prometheus-operator/values-production.yaml b/bitnami/prometheus-operator/values-production.yaml index 45fe8d945..c1f30ed6f 100644 --- a/bitnami/prometheus-operator/values-production.yaml +++ b/bitnami/prometheus-operator/values-production.yaml @@ -303,6 +303,9 @@ prometheus: annotations: {} serviceMonitor: + ## Creates a ServiceMonitor to monitor Prometheus itself + enabled: true + ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## @@ -601,6 +604,9 @@ alertmanager: ## If true, create a serviceMonitor for alertmanager ## serviceMonitor: + ## Creates a ServiceMonitor to monitor Alertmanager + enabled: true + ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## diff --git a/bitnami/prometheus-operator/values.yaml b/bitnami/prometheus-operator/values.yaml index f4414be5c..27270156d 100644 --- a/bitnami/prometheus-operator/values.yaml +++ b/bitnami/prometheus-operator/values.yaml @@ -303,6 +303,9 @@ prometheus: annotations: {} serviceMonitor: + ## Creates a ServiceMonitor to monitor Prometheus itself + enabled: true + ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ## @@ -601,6 +604,9 @@ alertmanager: ## If true, create a serviceMonitor for alertmanager ## serviceMonitor: + ## Creates a ServiceMonitor to monitor Alertmanager + enabled: true + ## Scrape interval. If not set, the Prometheus default scrape interval is used. ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint ##