From 350abaff4d7fad577cd148972f541d504ece0893 Mon Sep 17 00:00:00 2001 From: Bismarck Paliz Date: Thu, 6 Jun 2019 16:34:02 -0400 Subject: [PATCH] Adding support for `replicaExternalLabelName` and `prometheusExternalLabelName`. (#14572) Signed-off-by: Bismarck Paliz --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 4 ++++ stable/prometheus-operator/ci/test-values.yaml | 16 ++++++++++++++++ .../templates/prometheus/prometheus.yaml | 10 ++++++++++ stable/prometheus-operator/values.yaml | 16 ++++++++++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 4eae49c2f9..d42576a853 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -11,7 +11,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 5.12.1 +version: 5.12.2 appVersion: 0.30.1 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 7521597d3e..41275648aa 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -214,6 +214,10 @@ The following tables list the configurable parameters of the prometheus-operator | `prometheus.prometheusSpec.scrapeInterval` | Interval between consecutive scrapes. | `""` | | `prometheus.prometheusSpec.evaluationInterval` | Interval between consecutive evaluations. | `""` | | `prometheus.prometheusSpec.externalLabels` | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | `[]` | +| `prometheus.prometheusSpec.replicaExternalLabelName` | Name of the external label used to denote replica name. | `""` | +| `prometheus.prometheusSpec.replicaExternalLabelNameClear` | If true, the Operator won't add the external label used to denote replica name. | `false` | +| `prometheus.prometheusSpec.prometheusExternalLabelName` | Name of the external label used to denote Prometheus instance name. | `""` | +| `prometheus.prometheusSpec.prometheusExternalLabelNameClear` | If true, the Operator won't add the external label used to denote Prometheus instance name. | `false` | | `prometheus.prometheusSpec.externalUrl` | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | `""` | | `prometheus.prometheusSpec.routePrefix` | The route prefix Prometheus registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`. | `/` | | `prometheus.prometheusSpec.storageSpec` | Storage spec to specify how storage shall be used. | `{}` | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 5c9625aab7..8aed18fb87 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -1176,6 +1176,22 @@ prometheus: ## externalLabels: {} + ## Name of the external label used to denote replica name + ## + replicaExternalLabelName: "" + + ## If true, the Operator won't add the external label used to denote replica name + ## + replicaExternalLabelNameClear: false + + ## Name of the external label used to denote Prometheus instance name + ## + prometheusExternalLabelName: "" + + ## If true, the Operator won't add the external label used to denote Prometheus instance name + ## + prometheusExternalLabelNameClear: false + ## External URL at which Prometheus will be reachable. ## externalUrl: "" diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index 7138f9f22d..72b72bf0d1 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -27,6 +27,16 @@ spec: externalLabels: {{ toYaml .Values.prometheus.prometheusSpec.externalLabels | indent 4}} {{- end }} +{{- if .Values.prometheus.prometheusSpec.prometheusExternalLabelNameClear }} + prometheusExternalLabelName: "" +{{- else if .Values.prometheus.prometheusSpec.prometheusExternalLabelName }} + prometheusExternalLabelName: "{{ .Values.prometheus.prometheusSpec.prometheusExternalLabelName }}" +{{- end }} +{{- if .Values.prometheus.prometheusSpec.replicaExternalLabelNameClear }} + replicaExternalLabelName: "" +{{- else if .Values.prometheus.prometheusSpec.replicaExternalLabelName }} + replicaExternalLabelName: "{{ .Values.prometheus.prometheusSpec.replicaExternalLabelName }}" +{{- end }} {{- if .Values.prometheus.prometheusSpec.externalUrl }} externalUrl: "{{ .Values.prometheus.prometheusSpec.externalUrl }}" {{- else if .Values.prometheus.ingress.enabled }} diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 1b7f2e2392..7c51425260 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -1176,6 +1176,22 @@ prometheus: ## externalLabels: {} + ## Name of the external label used to denote replica name + ## + replicaExternalLabelName: "" + + ## If true, the Operator won't add the external label used to denote replica name + ## + replicaExternalLabelNameClear: false + + ## Name of the external label used to denote Prometheus instance name + ## + prometheusExternalLabelName: "" + + ## If true, the Operator won't add the external label used to denote Prometheus instance name + ## + prometheusExternalLabelNameClear: false + ## External URL at which Prometheus will be reachable. ## externalUrl: ""