feat(mixed datasources): continued work on editor design change

2015-08-16 20:52:30 +02:00
parent 3105215425
commit a16c63a43e
19 changed files with 117 additions and 73 deletions
@@ -90,6 +90,11 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		"type": "grafana",
 		"meta": grafanaDatasourceMeta,
 	}
+	// add mixed backend data source
+	datasources["mixed"] = map[string]interface{}{
+		"type": "mixed",
+		"meta": plugins.DataSources["mixed"],
+	}

 	if defaultDatasource == "" {
 		defaultDatasource = "grafana"