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

Added system admin skeleton

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-11 12:12:29 +01:00
parent dc16c8c60c
commit 8e65f36131
4 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
conf/grafana.ini
View File

@@ -63,24 +63,12 @@ type = sqlite3
host = 127.0.0.1:3306 host = 127.0.0.1:3306
name = grafana name = grafana
user = root user = root
PASSWD = password =
; For "postgres" only, either "disable", "require" or "verify-full" ; For "postgres" only, either "disable", "require" or "verify-full"
ssl_mode = disable ssl_mode = disable
; For "sqlite3" only ; For "sqlite3" only
path = data/grafana.db path = data/grafana.db
; [database]
; ; Either "mysql", "postgres" or "sqlite3", it's your choice
; type = postgres
; host = 127.0.0.1:5432
; name = grafana
; user = grafana
; password = grafana
; ; For "postgres" only, either "disable", "require" or "verify-full"
; ssl_mode = disable
; ; For "sqlite3" only
; path = data/grafana.db
;
[log] [log]
root_path = root_path =
; Either "console", "file", "conn", "smtp" or "database", default is "console" ; Either "console", "file", "conn", "smtp" or "database", default is "console"

2
grafana

Submodule grafana updated: 1d769fe41c...b66894f727

13
pkg/api/api.go
View File

@@ -27,11 +27,14 @@ func Register(m *macaron.Macaron) {
m.Get("/api/account/others", auth, GetOtherAccounts) m.Get("/api/account/others", auth, GetOtherAccounts)
// data sources // data sources
m.Get("/admin/datasources/", auth, Index) m.Get("/acount/datasources/", auth, Index)
m.Get("/api/admin/datasources/list", auth, GetDataSources) m.Get("/api/datasources/list", auth, GetDataSources)
m.Put("/api/admin/datasources", auth, AddDataSource) m.Put("/api/datasources", auth, AddDataSource)
m.Post("/api/admin/datasources", auth, UpdateDataSource) m.Post("/api/datasources", auth, UpdateDataSource)
m.Delete("/api/admin/datasources/:id", auth, DeleteDataSource) m.Delete("/api/datasources/:id", auth, DeleteDataSource)
// system admin
m.Get("/admin", auth, Index)
// data source proxy // data source proxy
m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest) m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)

8
pkg/api/frontendsettings.go
View File

@@ -25,7 +25,7 @@ func getFrontendSettings(c *middleware.Context) (map[string]interface{}, error)
datasources := make(map[string]interface{}) datasources := make(map[string]interface{})
for i, ds := range accountDataSources { for _, ds := range accountDataSources {
url := ds.Url url := ds.Url
if ds.Access == m.DS_ACCESS_PROXY { if ds.Access == m.DS_ACCESS_PROXY {
@@ -46,12 +46,6 @@ func getFrontendSettings(c *middleware.Context) (map[string]interface{}, error)
} }
} }
// temp hack, first is always default
// TODO: implement default ds account setting
if i == 0 {
dsMap["default"] = true
}
datasources[ds.Name] = dsMap datasources[ds.Name] = dsMap
} }