From 21bfdd445f54e62a006a9f6552f5465d1a4fb1a3 Mon Sep 17 00:00:00 2001 From: Nathan Marrs Date: Thu, 6 Feb 2025 08:01:11 -0700 Subject: [PATCH] Image Renderer: Minor refactor cleanup (#100089) --- pkg/services/rendering/rendering.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go index 744f5e09e18..89370542de1 100644 --- a/pkg/services/rendering/rendering.go +++ b/pkg/services/rendering/rendering.go @@ -424,7 +424,7 @@ func (rs *RenderingService) getNewFilePath(rt RenderType) (string, error) { // getGrafanaCallbackURL creates a URL to send to the image rendering as callback for rendering a Grafana resource func (rs *RenderingService) getGrafanaCallbackURL(path string) string { - if rs.Cfg.RendererUrl != "" { + if rs.Cfg.RendererUrl != "" || rs.Cfg.RendererCallbackUrl != "" { // The backend rendering service can potentially be remote. // So we need to use the root_url to ensure the rendering service // can reach this Grafana instance. @@ -433,11 +433,6 @@ func (rs *RenderingService) getGrafanaCallbackURL(path string) string { return fmt.Sprintf("%s%s&render=1", rs.Cfg.RendererCallbackUrl, path) } - if rs.Cfg.RendererCallbackUrl != "" { - // &render=1 signals to the legacy redirect layer to - return fmt.Sprintf("%s%s&render=1", rs.Cfg.RendererCallbackUrl, path) - } - protocol := rs.Cfg.Protocol switch protocol { case setting.HTTPScheme: