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

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-07-23 12:01:48 +02:00
commit b943e41434
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/http_api/dashboard.md
View File

@ -96,7 +96,7 @@ Will return the dashboard given the dashboard slug. Slug is the url friendly ver
"isStarred": false, "isStarred": false,
"slug": "production-overview" "slug": "production-overview"
}, },
"model": { "dashboard": {
"id": null, "id": null,
"title": "Production Overview", "title": "Production Overview",
"tags": [ "templated" ], "tags": [ "templated" ],

9
pkg/api/dataproxy.go
View File

@ -90,6 +90,11 @@ func ProxyDataSourceRequest(c *middleware.Context) {
return return
} }
if ds.Type == m.DS_CLOUDWATCH {
cloudwatch.HandleRequest(c, ds)
return
}
targetUrl, _ := url.Parse(ds.Url) targetUrl, _ := url.Parse(ds.Url)
if len(setting.DataProxyWhiteList) > 0 { if len(setting.DataProxyWhiteList) > 0 {
if _, exists := setting.DataProxyWhiteList[targetUrl.Host]; !exists { if _, exists := setting.DataProxyWhiteList[targetUrl.Host]; !exists {
@ -98,13 +103,9 @@ func ProxyDataSourceRequest(c *middleware.Context) {
} }
} }
if ds.Type == m.DS_CLOUDWATCH {
cloudwatch.HandleRequest(c, ds)
} else {
proxyPath := c.Params("*") proxyPath := c.Params("*")
proxy := NewReverseProxy(ds, proxyPath, targetUrl) proxy := NewReverseProxy(ds, proxyPath, targetUrl)
proxy.Transport = dataProxyTransport proxy.Transport = dataProxyTransport
proxy.ServeHTTP(c.Resp, c.Req.Request) proxy.ServeHTTP(c.Resp, c.Req.Request)
c.Resp.Header().Del("Set-Cookie") c.Resp.Header().Del("Set-Cookie")
} }
}