Merge pull request #1782 from code-chris/prometheus-additional-scrape-config

[bitnami/prometheus-operator]: Fix additionalScrapeConfig usage

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.6
+version: 0.8.0
 keywords:
 - prometheus
 - alertmanager

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](#additional-scrape-configurations) for details.    |
 
 ### Alertmanager Parameters
 
@@ -351,6 +351,10 @@ This chart includes a `values-production.yaml` file where you can find some para
 +   logLevel: error
 ```
 
+### Additional 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

bitnami/prometheus-operator/templates/prometheus/prometheus.yaml

@@ -137,6 +137,11 @@ spec:
     {{- if .Values.prometheus.podAffinity }}
     podAffinity: {{- include "prometheus-operator.tplValue" (dict "value" .Values.prometheus.podAffinity "context" $) | nindent 6 }}
     {{- end }}
+    {{- if .Values.prometheus.additionalScrapeConfigsExternal }}
+    additionalScrapeConfigs:
+      name: {{ template "prometheus-operator.prometheus.fullname" . }}-scrape-config
+      key: additional-scrape-configs.yaml
+    {{- end }}
 {{- include "prometheus-operator.prometheus.imagePullSecrets" . | indent 2 }}
   {{- if .Values.prometheus.containers }}
   containers: {{- include "prometheus-operator.tplValue" (dict "value" .Values.prometheus.containers "context" $) | nindent 4 }}