home/charts
2
0
Fork 0
mirror of https://github.com/wahyd4/charts.git synced 2026-08-22 03:25:53 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1763 from code-chris/prometheus-optional-monitors

Browse Source 
[bitnami/prometheus-operator]: Make ServiceMonitor of Prometheus and Alertmanager optional
This commit is contained in:
Sameer Naik
2019-12-23 10:56:57 +05:30
committed by GitHub
parent 110d92bd78 37598939ec
commit 1c21b2cfbf
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/prometheus-operator/README.md
+2
View File
@@ -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 | `[]` |
bitnami/prometheus-operator/templates/alertmanager/servicemonitor.yaml
+1 -1
View File
@@ -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:
bitnami/prometheus-operator/templates/prometheus/servicemonitor.yaml
+1 -1
View File
@@ -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:
bitnami/prometheus-operator/values-production.yaml
+6
View File
@@ -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
##
bitnami/prometheus-operator/values.yaml
+6
View File
@@ -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
##