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

This commit is contained in:
Torkel Ödegaard
2015-08-16 20:52:30 +02:00
parent 3105215425
commit a16c63a43e
19 changed files with 117 additions and 73 deletions
+9 -1
View File
@@ -112,5 +112,13 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) {
}
func GetDataSourcePlugins(c *middleware.Context) {
c.JSON(200, plugins.DataSources)
dsList := make(map[string]interface{})
for key, value := range plugins.DataSources {
if value.(map[string]interface{})["hide"] == nil {
dsList[key] = value
}
}
c.JSON(200, dsList)
}
+5
View File
@@ -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"