root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Dashboard import/export now works

This commit is contained in:
Torkel Ödegaard 2015-01-17 10:39:26 +01:00
parent c970e82758
commit 9a29b04561
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit a0036179d500366e28552d2c332fd50f534913a3 Subproject commit 1c5f902770c260f9bc63a0f07f1e9d22f60ce796

4
pkg/api/frontendsettings.go
View File

@ -46,6 +46,10 @@ func getFrontendSettings(c *middleware.Context) (map[string]interface{}, error)
} }
} }
if ds.Type == m.DS_ES {
dsMap["index"] = ds.Database
}
datasources[ds.Name] = dsMap datasources[ds.Name] = dsMap
} }

2
pkg/models/datasource.go
View File

@ -8,7 +8,7 @@ import (
const ( const (
DS_GRAPHITE = "graphite" DS_GRAPHITE = "graphite"
DS_INFLUXDB = "influxdb" DS_INFLUXDB = "influxdb"
DS_ES = "es" DS_ES = "elasticsearch"
DS_ACCESS_DIRECT = "direct" DS_ACCESS_DIRECT = "direct"
DS_ACCESS_PROXY = "proxy" DS_ACCESS_PROXY = "proxy"
) )