[kube-prometheus-stack] introduce optional param grafana.sidecar.data…

…sources.defaultDatasourceScrapeInterval. (#659)

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

@@ -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

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

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: {}