diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go index 3b075244667..14cc9556f2f 100644 --- a/pkg/services/rendering/rendering.go +++ b/pkg/services/rendering/rendering.go @@ -135,8 +135,17 @@ func (rs *RenderingService) getURL(path string) string { return fmt.Sprintf("%s%s&render=1", rs.Cfg.RendererCallbackUrl, path) } + + protocol := setting.Protocol + switch setting.Protocol { + case setting.HTTP: + protocol = "http" + case setting.HTTP2, setting.HTTPS: + protocol = "https" + } + // &render=1 signals to the legacy redirect layer to - return fmt.Sprintf("%s://%s:%s/%s&render=1", setting.Protocol, rs.domain, setting.HttpPort, path) + return fmt.Sprintf("%s://%s:%s/%s&render=1", protocol, rs.domain, setting.HttpPort, path) } func (rs *RenderingService) getRenderKey(orgId, userId int64, orgRole models.RoleType) (string, error) {