diff --git a/data/sessions/5/a/5a7a6d798450f878d373110c50ed07ae3bc99d63 b/data/sessions/5/a/5a7a6d798450f878d373110c50ed07ae3bc99d63 deleted file mode 100644 index f1f06840570..00000000000 Binary files a/data/sessions/5/a/5a7a6d798450f878d373110c50ed07ae3bc99d63 and /dev/null differ diff --git a/data/sessions/5/e/5e40ff05d87ac75cba0634e7350c263c4c45f202 b/data/sessions/5/e/5e40ff05d87ac75cba0634e7350c263c4c45f202 deleted file mode 100644 index f1f06840570..00000000000 Binary files a/data/sessions/5/e/5e40ff05d87ac75cba0634e7350c263c4c45f202 and /dev/null differ diff --git a/data/sessions/7/a/7ad60c89b1bc7a310c66e59570df698fc75d28b3 b/data/sessions/7/a/7ad60c89b1bc7a310c66e59570df698fc75d28b3 deleted file mode 100644 index f1f06840570..00000000000 Binary files a/data/sessions/7/a/7ad60c89b1bc7a310c66e59570df698fc75d28b3 and /dev/null differ diff --git a/data/sessions/7/b/7b786a2d47bb26f2fce2d9aa874615c6428c55a3 b/data/sessions/7/b/7b786a2d47bb26f2fce2d9aa874615c6428c55a3 deleted file mode 100644 index f1f06840570..00000000000 Binary files a/data/sessions/7/b/7b786a2d47bb26f2fce2d9aa874615c6428c55a3 and /dev/null differ diff --git a/data/sessions/b/7/b724e1a2a6d52de49c11d1d62d6e0d83cba2911a b/data/sessions/b/7/b724e1a2a6d52de49c11d1d62d6e0d83cba2911a deleted file mode 100644 index f1f06840570..00000000000 Binary files a/data/sessions/b/7/b724e1a2a6d52de49c11d1d62d6e0d83cba2911a and /dev/null differ diff --git a/grafana-pro b/grafana-pro index 6e7357699ff..756089496b9 100755 Binary files a/grafana-pro and b/grafana-pro differ diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go index 26e7d096c90..fce0f6b8349 100644 --- a/pkg/middleware/logger.go +++ b/pkg/middleware/logger.go @@ -44,6 +44,7 @@ func Logger() macaron.Handler { switch rw.Status() { case 200: content = fmt.Sprintf("\033[1;32m%s\033[0m", content) + return case 304: return content = fmt.Sprintf("\033[1;33m%s\033[0m", content) diff --git a/pkg/routes/api/api_render.go b/pkg/routes/api/api_render.go index fea4acb3f79..b0cc7a7954a 100644 --- a/pkg/routes/api/api_render.go +++ b/pkg/routes/api/api_render.go @@ -1,6 +1,7 @@ package api import ( + "net/http" "strconv" "github.com/torkelo/grafana-pro/pkg/components/renderer" @@ -14,17 +15,18 @@ func RenderToPng(c *middleware.Context) { queryParams := "?render&accountId=" + strconv.Itoa(accountId) + "&" + c.Req.URL.RawQuery renderOpts := &renderer.RenderOpts{ - Url: c.Params("url") + queryParams, + Url: c.Params("*") + queryParams, Width: queryReader.Get("width", "800"), Height: queryReader.Get("height", "400"), } - renderOpts.Url = "http://localhost:3000" + renderOpts.Url + renderOpts.Url = "http://localhost:3000/" + renderOpts.Url pngPath, err := renderer.RenderToPng(renderOpts) if err != nil { c.HTML(500, "error.html", nil) } - c.ServeFile(pngPath) + c.Resp.Header().Set("Content-Type", "image/png") + http.ServeFile(c.Resp, c.Req, pngPath) } diff --git a/pkg/routes/index.go b/pkg/routes/index.go index ca51e723b54..135d6c8360b 100644 --- a/pkg/routes/index.go +++ b/pkg/routes/index.go @@ -27,7 +27,7 @@ func Register(m *macaron.Macaron) { m.Delete("/api/dashboard/:slug", auth, api.DeleteDashboard) // rendering - m.Get("/render/*url", auth, api.RenderToPng) + m.Get("/render/*", auth, api.RenderToPng) } func Index(ctx *middleware.Context) {