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

docs/sources/http_api/dashboard.md

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

pkg/api/dataproxy.go

@@ -90,6 +90,11 @@ func ProxyDataSourceRequest(c *middleware.Context) {
 		return
 	}
 
+	if ds.Type == m.DS_CLOUDWATCH {
+		cloudwatch.HandleRequest(c, ds)
+		return
+	}
+
 	targetUrl, _ := url.Parse(ds.Url)
 	if len(setting.DataProxyWhiteList) > 0 {
 		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("*")
-		proxy := NewReverseProxy(ds, proxyPath, targetUrl)
-		proxy.Transport = dataProxyTransport
-		proxy.ServeHTTP(c.Resp, c.Req.Request)
-		c.Resp.Header().Del("Set-Cookie")
-	}
+	proxyPath := c.Params("*")
+	proxy := NewReverseProxy(ds, proxyPath, targetUrl)
+	proxy.Transport = dataProxyTransport
+	proxy.ServeHTTP(c.Resp, c.Req.Request)
+	c.Resp.Header().Del("Set-Cookie")
 }