From ca84829647c70c58d66783a140c41c2883071640 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Fri, 17 Jan 2020 13:39:41 +0100
Subject: [PATCH] Provisioning: Start provision dashboards after Grafana server
 have started (#21564)

6.2-beta1 changed so that data sources, dashboards and alert notifiers
are provisioned on service Init where's before only data sources and
alert notifiers was provisioned on service Init and dashboards was first
provisioned in service Run which happens after Grafana server have
started.
This change reverts so that dashboard provisioning are first happening
in service Run, after Grafana server have started.

Fixes #21133
---
 pkg/services/provisioning/provisioning.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go
index e00214a9152..4901de73572 100644
--- a/pkg/services/provisioning/provisioning.go
+++ b/pkg/services/provisioning/provisioning.go
@@ -69,15 +69,15 @@ func (ps *provisioningServiceImpl) Init() error {
 		return err
 	}
 
-	err = ps.ProvisionDashboards()
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 func (ps *provisioningServiceImpl) Run(ctx context.Context) error {
+	err := ps.ProvisionDashboards()
+	if err != nil {
+		ps.log.Error("Failed to provision dashboard", "error", err)
+	}
+
 	for {
 
 		// Wait for unlock. This is tied to new dashboardProvisioner to be instantiated before we start polling.