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

Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-31 15:45:49 +02:00
parent 3dfa28570f 3405e44a1d
commit ffbf70af25
93 changed files with 25533 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/dataproxy.go
View File

@ -72,8 +72,12 @@ func ProxyDataSourceRequest(c *middleware.Context) {
return
}
proxyPath := c.Params("*")
proxy := NewReverseProxy(&query.Result, proxyPath)
proxy.Transport = dataProxyTransport
proxy.ServeHTTP(c.RW(), c.Req.Request)
if query.Result.Type == m.DS_CLOUDWATCH {
ProxyCloudWatchDataSourceRequest(c)
} else {
proxyPath := c.Params("*")
proxy := NewReverseProxy(&query.Result, proxyPath)
proxy.Transport = dataProxyTransport
proxy.ServeHTTP(c.RW(), c.Req.Request)
}
}