IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 16:45:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-09-11 08:13:49 +02:00
commit fb9e91e486
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@ -67,7 +67,7 @@ path = grafana.db
#################################### Session ####################################
[session]
# Either "memory", "file", "redis", "mysql", "postgresql", default is "file"
# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
provider = file
# Provider config options

2
conf/sample.ini
View File

@ -67,7 +67,7 @@
#################################### Session ####################################
[session]
# Either "memory", "file", "redis", "mysql", "postgresql", default is "file"
# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
;provider = file
# Provider config options

6
pkg/api/dataproxy_test.go
View File

@ -14,7 +14,8 @@ func TestDataSourceProxy(t *testing.T) {
Convey("When getting graphite datasource proxy", t, func() {
ds := m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE}
proxy := NewReverseProxy(&ds, "/render")
targetUrl, _ := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "/render", targetUrl)
requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl}
@ -36,7 +37,8 @@ func TestDataSourceProxy(t *testing.T) {
Password: "password",
}
proxy := NewReverseProxy(&ds, "")
targetUrl, _ := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "", targetUrl)
requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl}