(cherry picked from commit a4f75cc0438712c90b02d24740416f8615e3a0cb)
(cherry picked from commit 6ec06f66b9)
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
This commit is contained in:
co-authored by
Joan López de la Franca Beltran
parent
0a4d2bbe3d
commit
e5741c82d6
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user