diff --git a/stable/kommander/templates/grafana/hooks-home-dashboard.yaml b/stable/kommander/templates/grafana/hooks-home-dashboard.yaml index c83ed9e98c..5179897032 100644 --- a/stable/kommander/templates/grafana/hooks-home-dashboard.yaml +++ b/stable/kommander/templates/grafana/hooks-home-dashboard.yaml @@ -9,7 +9,7 @@ metadata: {{ include "kommander.labels" . | indent 4 }} annotations: helm.sh/hook: post-install - helm.sh/hook-weight: "-4" + helm.sh/hook-weight: "-5" helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation spec: template: @@ -35,7 +35,6 @@ spec: configMap: name: {{ .Values.grafana.hooks.jobName }} defaultMode: 0777 - --- apiVersion: v1 kind: ConfigMap @@ -48,8 +47,9 @@ data: set -o errexit set -o pipefail CURL="curl --verbose --fail --max-time 60 --retry 10 --retry-connrefused" - DASHBOARD_ID=$($CURL -H "X-Forwarded-User: $X_FORWARDED_USER" {{ .Values.grafana.hooks.serviceURL }}/api/dashboards/uid/{{ .Values.grafana.hooks.homeDashboardUID }} | jq '.[0].id') + DASHBOARD_ID=$($CURL -H "X-Forwarded-User: $X_FORWARDED_USER" {{ .Values.grafana.hooks.serviceURL }}/api/dashboards/uid/{{ .Values.grafana.hooks.homeDashboardUID }} | jq '.dashboard.id') echo "setting home dashboard to ID" $DASHBOARD_ID + $CURL -X PUT -H "Content-Type: application/json" -H "X-Forwarded-User: $X_FORWARDED_USER" -d '{"homeDashboardId":'"$DASHBOARD_ID"'}' {{ .Values.grafana.hooks.serviceURL }}/api/org/preferences --- apiVersion: batch/v1 kind: Job @@ -60,7 +60,7 @@ metadata: {{ include "kommander.labels" . | indent 4 }} annotations: "helm.sh/hook": pre-delete - "helm.sh/hook-weight": "-4" + "helm.sh/hook-weight": "-5" "helm.sh/hook-delete-policy": hook-succeeded spec: template: diff --git a/stable/kommander/values.yaml b/stable/kommander/values.yaml index ed470e97db..2b3e815846 100644 --- a/stable/kommander/values.yaml +++ b/stable/kommander/values.yaml @@ -82,7 +82,7 @@ grafana: jobName: grafana-home-dashboard image: dwdraju/alpine-curl-jq secretKeyRef: ops-portal-credentials - serviceURL: http://kommander-kubeaddons-grafana.kommander:3000 + serviceURL: http://kommander-kubeaddons-grafana.kommander homeDashboardUID: efa86fd1d0c121a26444b636a3f509a8 ## Do not deploy default dashboards.