2021-05-17 22:30:18 +00:00
|
|
|
--- charts-original/templates/grafana/configmaps-datasources.yaml
|
|
|
|
|
+++ charts/templates/grafana/configmaps-datasources.yaml
|
2021-06-10 03:52:17 +00:00
|
|
|
@@ -1,9 +1,9 @@
|
|
|
|
|
-{{- if and .Values.grafana.enabled .Values.grafana.sidecar.datasources.enabled }}
|
|
|
|
|
+{{- if or (and .Values.grafana.enabled .Values.grafana.sidecar.datasources.enabled) .Values.grafana.forceDeployDatasources }}
|
|
|
|
|
apiVersion: v1
|
2021-05-17 22:30:18 +00:00
|
|
|
kind: ConfigMap
|
|
|
|
|
metadata:
|
|
|
|
|
name: {{ template "kube-prometheus-stack.fullname" . }}-grafana-datasource
|
|
|
|
|
- namespace: {{ template "kube-prometheus-stack.namespace" . }}
|
|
|
|
|
+ namespace: {{ default .Values.grafana.sidecar.datasources.searchNamespace (include "kube-prometheus-stack.namespace" .) }}
|
|
|
|
|
{{- if .Values.grafana.sidecar.datasources.annotations }}
|
|
|
|
|
annotations:
|
|
|
|
|
{{ toYaml .Values.grafana.sidecar.datasources.annotations | indent 4 }}
|
2021-06-10 03:52:17 +00:00
|
|
|
@@ -20,7 +20,11 @@
|
|
|
|
|
{{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
|
|
|
|
|
- name: Prometheus
|
|
|
|
|
type: prometheus
|
|
|
|
|
+ {{- if .Values.grafana.sidecar.datasources.url }}
|
|
|
|
|
+ url: {{ .Values.grafana.sidecar.datasources.url }}
|
|
|
|
|
+ {{- else }}
|
|
|
|
|
url: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }}
|
|
|
|
|
+ {{- end }}
|
|
|
|
|
access: proxy
|
|
|
|
|
isDefault: true
|
|
|
|
|
jsonData:
|
