diff --git a/pkg/api/render.go b/pkg/api/render.go index ab794e7ce3e..6018656badb 100644 --- a/pkg/api/render.go +++ b/pkg/api/render.go @@ -14,7 +14,7 @@ func RenderToPng(c *middleware.Context) { queryParams := fmt.Sprintf("?%s", c.Req.URL.RawQuery) renderOpts := &renderer.RenderOpts{ - Url: c.Params("*") + queryParams, + Path: c.Params("*") + queryParams, Width: queryReader.Get("width", "800"), Height: queryReader.Get("height", "400"), OrgId: c.OrgId, diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index 87791bbb1a5..a55ba5e0ab5 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -18,7 +18,7 @@ import ( ) type RenderOpts struct { - Url string + Path string Width string Height string Timeout string @@ -28,14 +28,14 @@ type RenderOpts struct { var rendererLog log.Logger = log.New("png-renderer") func RenderToPng(params *RenderOpts) (string, error) { - rendererLog.Info("Rendering", "url", params.Url) + rendererLog.Info("Rendering", "path", params.Path) var executable = "phantomjs" if runtime.GOOS == "windows" { executable = executable + ".exe" } - params.Url = fmt.Sprintf("%s://localhost:%s/%s", setting.Protocol, setting.HttpPort, params.Url) + url := fmt.Sprintf("%s://localhost:%s/%s", setting.Protocol, setting.HttpPort, params.Path) binPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, executable)) scriptPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "render.js")) @@ -48,7 +48,7 @@ func RenderToPng(params *RenderOpts) (string, error) { cmdArgs := []string{ "--ignore-ssl-errors=true", scriptPath, - "url=" + params.Url, + "url=" + url, "width=" + params.Width, "height=" + params.Height, "png=" + pngPath, diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index 68366d1abf3..52d4075ae6e 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -74,7 +74,7 @@ func (n *RootNotifier) uploadImage(context *EvalContext) (err error) { if slug, err := context.GetDashboardSlug(); err != nil { return err } else { - renderOpts.Url = fmt.Sprintf("dashboard-solo/db/%s?&panelId=%d", slug, context.Rule.PanelId) + renderOpts.Path = fmt.Sprintf("dashboard-solo/db/%s?&panelId=%d", slug, context.Rule.PanelId) } if imagePath, err := renderer.RenderToPng(renderOpts); err != nil {