public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.4.x] Plugins: Set correct PDC config values for proxy requests (#85413)

Browse Source 
Plugins: Set correct PDC config values for proxy requests (#85412)

pass appropriate values

(cherry picked from commit 22fe7b067c)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-03-29 21:50:11 +02:00
committed by GitHub
co-authored by Will Browne
parent 726f38967c
commit 78e07dc609
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource.go
+6 -3
View File
@@ -532,9 +532,12 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
},
Timeouts: &sdkproxy.DefaultTimeoutOptions,
ClientCfg: &sdkproxy.ClientCfg{
ClientCert: s.cfg.SecureSocksDSProxy.ClientCert,
ClientKey: s.cfg.SecureSocksDSProxy.ClientKey,
RootCAs: s.cfg.SecureSocksDSProxy.RootCAs,
ClientCert: s.cfg.SecureSocksDSProxy.ClientCertFilePath,
ClientKey: s.cfg.SecureSocksDSProxy.ClientKeyFilePath,
RootCAs: s.cfg.SecureSocksDSProxy.RootCAFilePaths,
ClientCertVal: s.cfg.SecureSocksDSProxy.ClientCert,
ClientKeyVal: s.cfg.SecureSocksDSProxy.ClientKey,
RootCAsVals: s.cfg.SecureSocksDSProxy.RootCAs,
ProxyAddress: s.cfg.SecureSocksDSProxy.ProxyAddress,
ServerName: s.cfg.SecureSocksDSProxy.ServerName,
AllowInsecure: s.cfg.SecureSocksDSProxy.AllowInsecure,