IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-17 17:07:33 +02:00
parent 56d5b0b12a
commit 6ee0f2c6a7
11 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/datasources.go
View File

@@ -115,7 +115,7 @@ func GetDataSourcePlugins(c *middleware.Context) {
dsList := make(map[string]interface{})
for key, value := range plugins.DataSources {
if value.(map[string]interface{})["hide"] == nil {
if value.(map[string]interface{})["builtIn"] == nil {
dsList[key] = value
}
}

5
pkg/api/frontendsettings.go
View File

@@ -86,12 +86,13 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
// add grafana backend data source
grafanaDatasourceMeta, _ := plugins.DataSources["grafana"]
datasources["grafana"] = map[string]interface{}{
datasources["-- Grafana --"] = map[string]interface{}{
"type": "grafana",
"meta": grafanaDatasourceMeta,
}
// add mixed backend data source
datasources["mixed"] = map[string]interface{}{
datasources["-- Mixed --"] = map[string]interface{}{
"type": "mixed",
"meta": plugins.DataSources["mixed"],
}