Rendering: Add support for renderer token (#54425)

(cherry picked from commit a4f75cc0438712c90b02d24740416f8615e3a0cb)
This commit is contained in:
Joan López de la Franca Beltran
2022-08-30 12:09:38 +02:00
committed by GitHub
parent 8291ec1e44
commit 6ec06f66b9
7 changed files with 79 additions and 46 deletions
+3
View File
@@ -28,6 +28,8 @@ var netClient = &http.Client{
Transport: netTransport,
}
const authTokenHeader = "X-Auth-Token" //#nosec G101 -- This is a false positive
var (
remoteVersionFetchInterval time.Duration = time.Second * 15
remoteVersionFetchRetries uint = 4
@@ -141,6 +143,7 @@ func (rs *RenderingService) doRequest(ctx context.Context, url *url.URL, headers
return nil, err
}
req.Header.Set(authTokenHeader, rs.Cfg.RendererAuthToken)
req.Header.Set("User-Agent", fmt.Sprintf("Grafana/%s", rs.Cfg.BuildVersion))
for k, v := range headers {
req.Header[k] = v
+2
View File
@@ -41,6 +41,7 @@ func (rs *RenderingService) renderViaPlugin(ctx context.Context, renderKey strin
Timezone: isoTimeOffsetToPosixTz(opts.Timezone),
Domain: rs.domain,
Headers: headers,
AuthToken: rs.Cfg.RendererAuthToken,
}
rs.log.Debug("Calling renderer plugin", "req", req)
@@ -84,6 +85,7 @@ func (rs *RenderingService) renderCSVViaPlugin(ctx context.Context, renderKey st
Timeout: int32(opts.Timeout.Seconds()),
Timezone: isoTimeOffsetToPosixTz(opts.Timezone),
Headers: headers,
AuthToken: rs.Cfg.RendererAuthToken,
}
rs.log.Debug("Calling renderer plugin", "req", req)