From c8aada1bf81555e15b6b079284cdee5e1deb53c2 Mon Sep 17 00:00:00 2001 From: Christian Kotzbauer Date: Mon, 30 Dec 2019 15:42:36 +0100 Subject: [PATCH] [bitnami/prometheus-operator]: Review fixes Signed-off-by: Christian Kotzbauer --- bitnami/prometheus-operator/Chart.yaml | 2 +- bitnami/prometheus-operator/README.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/prometheus-operator/Chart.yaml b/bitnami/prometheus-operator/Chart.yaml index e9c76ccd2..caa478540 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.7 +version: 0.8.0 keywords: - prometheus - alertmanager diff --git a/bitnami/prometheus-operator/README.md b/bitnami/prometheus-operator/README.md index 4d40410f5..cc3a66655 100644 --- a/bitnami/prometheus-operator/README.md +++ b/bitnami/prometheus-operator/README.md @@ -210,7 +210,7 @@ The following table lists the configurable parameters of the Prometheus Operator | `prometheus.storageSpec` | Prometheus StorageSpec for persistent data | `{}` | | `prometheus.priorityClassName` | Priority class assigned to the Pods | `` | | `prometheus.containers` | Containers allows injecting additional containers | `[]` | -| `prometheus.additionalScrapeConfigsExternal` | Enable additional scrape configs that are managed externally to this chart | `false` | +| `prometheus.additionalScrapeConfigsExternal` | Enable additional scrape configs that are managed externally to this chart | `false` See [docs](#additionalScrape) for details. | ### Alertmanager Parameters @@ -351,6 +351,10 @@ This chart includes a `values-production.yaml` file where you can find some para + logLevel: error ``` +### Additonal scrape configurations + +It is possible to inject externally managed scrape configurations in a ConfigMap by enabling `prometheus.additionalScrapeConfigsExternal`. The ConfigMap must exist in the same namespace when Prometheus is starting. Its name is generated using the `prometheus-operator.prometheus.fullname` template with a `-scrape-config` suffix. The file it contains has to be named `additional-scrape-configs.yaml`. + ## Upgrading ```bash