opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 22:57:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source 
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
This commit is contained in:
Torkel Ödegaard
2016-03-11 12:39:10 +01:00
parent fc54c01f01 3fd420c901
commit ece8a925a6
52 changed files with 155 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/api.go
View File

@ -167,11 +167,10 @@ func Register(r *macaron.Macaron) {
r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
r.Delete("/:id", DeleteDataSource)
r.Get("/:id", wrap(GetDataSourceById))
r.Get("/name/:name", wrap(GetDataSourceByName))
}, reqOrgAdmin)
r.Group("/datasources/name/:name", func() {
r.Get("/", wrap(GetDataSourceByName))
}, reqOrgAdmin)
r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn)
r.Group("/plugins", func() {
r.Get("/", wrap(GetPluginList))