Work on data source proxying, #6

This commit is contained in:
Torkel Ödegaard
2014-12-18 20:26:06 +01:00
parent d69258e28f
commit a2a0e0394d
5 changed files with 98 additions and 3 deletions
+4 -1
View File
@@ -25,13 +25,16 @@ func Register(m *macaron.Macaron) {
m.Post("/api/account/using/:id", auth, SetUsingAccount)
m.Get("/api/account/others", auth, GetOtherAccounts)
// datasources
// data sources
m.Get("/admin/datasources/", auth, Index)
m.Get("/api/admin/datasources/list", auth, GetDataSources)
m.Put("/api/admin/datasources", auth, AddDataSource)
m.Post("/api/admin/datasources", auth, UpdateDataSource)
m.Delete("/api/admin/datasources/:id", auth, DeleteDataSource)
// data source proxy
m.Any("/api/datasources/proxy/:name/*", auth, ProxyDataSourceRequest)
// user register
m.Get("/register/*_", Index)
m.Post("/api/account", CreateAccount)
+5 -1
View File
@@ -25,9 +25,13 @@ func renderConfig(data *configJsTmplModel) string {
datasources := make(map[string]interface{})
for _, ds := range data.DataSources {
url := ds.Url
if ds.Access == m.DS_ACCESS_PROXY {
url = "/api/datasources/proxy/" + ds.Name
}
datasources[ds.Name] = map[string]interface{}{
"type": ds.Type,
"url": ds.Url,
"url": url,
}
}
+63
View File
@@ -0,0 +1,63 @@
package api
import (
"net/http"
"net/http/httputil"
"net/url"
"strings"
"github.com/torkelo/grafana-pro/pkg/bus"
"github.com/torkelo/grafana-pro/pkg/log"
"github.com/torkelo/grafana-pro/pkg/middleware"
m "github.com/torkelo/grafana-pro/pkg/models"
)
func singleJoiningSlash(a, b string) string {
aslash := strings.HasSuffix(a, "/")
bslash := strings.HasPrefix(b, "/")
switch {
case aslash && bslash:
return a + b[1:]
case !aslash && !bslash:
return a + "/" + b
}
return a + b
}
func NewReverseProxy(target *url.URL, proxyPath string) *httputil.ReverseProxy {
targetQuery := target.RawQuery
director := func(req *http.Request) {
req.URL.Scheme = target.Scheme
req.URL.Host = target.Host
req.URL.Path = singleJoiningSlash(target.Path, proxyPath)
if targetQuery == "" || req.URL.RawQuery == "" {
req.URL.RawQuery = targetQuery + req.URL.RawQuery
} else {
req.URL.RawQuery = targetQuery + "&" + req.URL.RawQuery
}
log.Info("Proxy: %v", req.URL.Path)
}
return &httputil.ReverseProxy{Director: director}
}
// TODO: need to cache datasources
func ProxyDataSourceRequest(c *middleware.Context) {
name := c.Params(":name")
query := m.GetDataSourceByNameQuery{
Name: name,
AccountId: c.GetAccountId(),
}
err := bus.Dispatch(&query)
if err != nil {
c.JsonApiErr(500, "Unable to load datasource meta data", err)
}
proxyPath := c.Params("*")
url, _ := url.Parse(query.Result.Url)
proxy := NewReverseProxy(url, proxyPath)
proxy.ServeHTTP(c.RW(), c.Req.Request)
}