Merge branch 'master' into websocket

2016-03-14 12:01:43 +01:00
parent fbd94fc6ce ca5a34ad1e
commit 8d7b7009c3
1 changed files with 7 additions and 0 deletions
@@ -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)
 	}