From 3f0eb5238909203aed0d2232e4e1500def483063 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 13 Oct 2017 16:51:15 +0200
Subject: [PATCH] datasource as cfg: ignore datasource all ready exist for
 inserts

---
 pkg/setting/datasources/datasources.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/setting/datasources/datasources.go b/pkg/setting/datasources/datasources.go
index 77a412382d3..a14d9326253 100644
--- a/pkg/setting/datasources/datasources.go
+++ b/pkg/setting/datasources/datasources.go
@@ -72,7 +72,8 @@ func (dc *DatasourceConfigurator) applyChanges(configPath string) error {
 		if dbDatasource == nil {
 			dc.log.Info("inserting datasource from configuration ", "name", ds.Name)
 			insertCmd := createInsertCommand(ds)
-			if err := dc.repository.insert(insertCmd); err != nil {
+			err := dc.repository.insert(insertCmd)
+			if err != nil && err != models.ErrDataSourceNameExists {
 				return err
 			}
 		} else {