diff --git a/applications/grafana-stack/grafana/templates/auto-reload-dashboard-job.yaml b/applications/grafana-stack/grafana/templates/auto-reload-dashboard-job.yaml index 6cc43c5..1a7249a 100644 --- a/applications/grafana-stack/grafana/templates/auto-reload-dashboard-job.yaml +++ b/applications/grafana-stack/grafana/templates/auto-reload-dashboard-job.yaml @@ -1,3 +1,4 @@ +{{- if and .Values.dashboardReloaderEnabled }} {{- $namespace := .Release.Namespace -}} apiVersion: batch/v1 kind: Job @@ -30,10 +31,11 @@ spec: # name: grafana-external-secrets # key: admin-username - name: password - value: admin + value: password # valueFrom: # secretKeyRef: # name: grafana-external-secrets # key: admin-password restartPolicy: Never backoffLimit: 1 +{{- end }} \ No newline at end of file diff --git a/applications/grafana-stack/grafana/values.yaml b/applications/grafana-stack/grafana/values.yaml index 61a945d..973c7dc 100644 --- a/applications/grafana-stack/grafana/values.yaml +++ b/applications/grafana-stack/grafana/values.yaml @@ -8,6 +8,16 @@ grafana: nameOverride: grafana fullnameOverride: grafana kubeNamespace: grafana-stack + + # assertNoLeakedSecrets is a helper function defined in _helpers.tpl that checks if secret + # values are not exposed in the rendered grafana.ini configmap. It is enabled by default. + # + # To pass values into grafana.ini without exposing them in a configmap, use variable expansion: + # https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion + # + # Alternatively, if you wish to allow secret values to be exposed in the rendered grafana.ini configmap, + # you can disable this check by setting assertNoLeakedSecrets to false. + assertNoLeakedSecrets: false replicas: 1 @@ -175,8 +185,8 @@ grafanaExternalSecret: remoteRef: key: /grafana/${ARGOCD_ENV_ENVIRONMENT}-${ARGOCD_ENV_CLUSTER}/admin/password - -# dashboardsToLoad: {} # directory name under dashboards +dashboardReloaderEnabled: false +# dashboardsToLoad: [] # directory name under dashboards dashboardsToLoad: # only dashboards under these directories will be loaded into grafana - infrastructure - ithacanoemon \ No newline at end of file