From 49e8db1a11ad59544f3e4a59629c3ea37bb64234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?=
 <cdesaintmartin@wiremind.fr>
Date: Wed, 10 Feb 2021 16:18:15 +0100
Subject: [PATCH] [kube-prometheus-stack] introduce optional param
 grafana.sidecar.datasources.defaultDatasourceScrapeInterval. (#659)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allow to decorelate prometheus.prometheusSpec.scrapeInterval from the one in grafana default datasource.

Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
---
 charts/kube-prometheus-stack/Chart.yaml                        | 2 +-
 .../templates/grafana/configmaps-datasources.yaml              | 2 +-
 charts/kube-prometheus-stack/values.yaml                       | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index 395c31a0d91..1b221cc4ae9 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -18,7 +18,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 13.6.0
+version: 13.7.0
 appVersion: 0.45.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
index 24bd44be9dc..db62d537e9d 100644
--- a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
+++ b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
@@ -16,7 +16,7 @@ data:
   datasource.yaml: |-
     apiVersion: 1
     datasources:
-{{- $scrapeInterval := .Values.prometheus.prometheusSpec.scrapeInterval | default "30s" }}
+{{- $scrapeInterval := .Values.grafana.sidecar.datasources.defaultDatasourceScrapeInterval | default .Values.prometheus.prometheusSpec.scrapeInterval | default "30s" }}
 {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
     - name: Prometheus
       type: prometheus
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index caa38b02d20..0bba5e98fb6 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -634,6 +634,9 @@ grafana:
       enabled: true
       defaultDatasourceEnabled: true
 
+      # If not defined, will use prometheus.prometheusSpec.scrapeInterval or its default
+      # defaultDatasourceScrapeInterval: 15s
+
       ## Annotations for Grafana datasource configmaps
       ##
       annotations: {}