From 35a2602e444c78a2869fb352fedc47bb0a994bce Mon Sep 17 00:00:00 2001 From: Vasily Sliouniaev Date: Thu, 25 Oct 2018 11:40:26 +0100 Subject: [PATCH] Add missing prometheus options to resource (#8738) - scrapeInterval - evaluationInterval Signed-off-by: Vasily Sliouniaev --- stable/prometheus-operator/Chart.yaml | 2 +- .../templates/prometheus/prometheus.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 7c00034dfd..bf5f1f8dd9 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 0.1.5 +version: 0.1.6 appVersion: "0.24.0" home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index c8af03e467..0b0bab1c02 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -39,6 +39,12 @@ spec: replicas: {{ .Values.prometheus.prometheusSpec.replicas }} logLevel: {{ .Values.prometheus.prometheusSpec.logLevel }} listenLocal: {{ .Values.prometheus.prometheusSpec.listenLocal }} +{{- if .Values.prometheus.prometheusSpec.scrapeInterval }} + scrapeInterval: {{ .Values.prometheus.prometheusSpec.scrapeInterval }} +{{- end }} +{{- if .Values.prometheus.prometheusSpec.evaluationInterval }} + evaluationInterval: {{ .Values.prometheus.prometheusSpec.evaluationInterval }} +{{- end }} {{- if .Values.prometheus.prometheusSpec.resources }} resources: {{ toYaml .Values.prometheus.prometheusSpec.resources | indent 4 }}