From f77bd59e1da4300c757284c293808ebb4b97c677 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 14 Mar 2016 11:33:38 +0100
Subject: [PATCH 1/3] fix(datasource): fixes testdatasource bug

---
 public/app/features/plugins/partials/ds_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 3305bfd67af..8822000df91 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -64,7 +64,7 @@
       <div class="gf-form-button-row">
         <button type="submit" class="btn btn-success" ng-show="ctrl.isNew" ng-click="ctrl.saveChanges()">Add</button>
         <button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button>
-        <button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges(true)">
+        <button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.testDatasource()">
           Test Connection
         </button>
         <a class="btn btn-link" href="datasources">Cancel</a>

From 953a07252afdfe6f7dbe2de7a69b1ac27ab78268 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 14 Mar 2016 11:43:35 +0100
Subject: [PATCH 2/3] Revert "fix(datasource): fixes testdatasource bug"

This reverts commit f77bd59e1da4300c757284c293808ebb4b97c677.
---
 public/app/features/plugins/partials/ds_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 8822000df91..3305bfd67af 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -64,7 +64,7 @@
       <div class="gf-form-button-row">
         <button type="submit" class="btn btn-success" ng-show="ctrl.isNew" ng-click="ctrl.saveChanges()">Add</button>
         <button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button>
-        <button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.testDatasource()">
+        <button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges(true)">
           Test Connection
         </button>
         <a class="btn btn-link" href="datasources">Cancel</a>

From ca5a34ad1ee4a8004135c49e31e466aff91e9521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 14 Mar 2016 12:00:56 +0100
Subject: [PATCH 3/3] fix(datasource): filter out built in data sources from
 data source type dropdown

---
 pkg/api/plugins.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index 195dd9483b8..2ee77ff0a92 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -48,6 +48,13 @@ func GetPluginList(c *middleware.Context) Response {
 			continue
 		}
 
+		// filter out built in data sources
+		if ds, exists := plugins.DataSources[pluginDef.Id]; exists {
+			if ds.BuiltIn {
+				continue
+			}
+		}
+
 		result = append(result, listItem)
 	}