public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent 1429737a60 96af2debfc
commit fb9e91e486
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/defaults.ini
+1 -1
View File
@@ -67,7 +67,7 @@ path = grafana.db
#################################### Session #################################### #################################### Session ####################################
[session] [session]
# Either "memory", "file", "redis", "mysql", "postgresql", default is "file" # Either "memory", "file", "redis", "mysql", "postgres", default is "file"
provider = file provider = file
# Provider config options # Provider config options
conf/sample.ini
+1 -1
View File
@@ -67,7 +67,7 @@
#################################### Session #################################### #################################### Session ####################################
[session] [session]
# Either "memory", "file", "redis", "mysql", "postgresql", default is "file" # Either "memory", "file", "redis", "mysql", "postgres", default is "file"
;provider = file ;provider = file
# Provider config options # Provider config options
pkg/api/dataproxy_test.go
+4 -2
View File
@@ -14,7 +14,8 @@ func TestDataSourceProxy(t *testing.T) {
Convey("When getting graphite datasource proxy", t, func() { Convey("When getting graphite datasource proxy", t, func() {
ds := m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE} 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") requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl} req := http.Request{URL: requestUrl}
@@ -36,7 +37,8 @@ func TestDataSourceProxy(t *testing.T) {
Password: "password", Password: "password",
} }
proxy := NewReverseProxy(&ds, "") targetUrl, _ := url.Parse(ds.Url)
proxy := NewReverseProxy(&ds, "", targetUrl)
requestUrl, _ := url.Parse("http://grafana.com/sub") requestUrl, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestUrl} req := http.Request{URL: requestUrl}