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

[v8.0.x] Datasource: Add support for max_conns_per_host in dataproxy settings (#35520) (#35573)

Browse Source 
Allow configuring dataproxy.max_conns_per_host for HTTP data sources.

Ref #35519
Ref #35257

(cherry picked from commit 6531424c72)

Co-authored-by: Javier Palomo <javier.palomo@grafana.com>
This commit is contained in:
Marcus Efraimsson
2021-06-11 17:18:44 +02:00
committed by GitHub
co-authored by Javier Palomo
parent 603c7ce2aa
commit 906af3bf4b
7 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/datasource_cache.go
+1
View File
@@ -88,6 +88,7 @@ func (ds *DataSource) HTTPClientOptions() sdkhttpclient.Options {
KeepAlive: time.Duration(setting.DataProxyKeepAlive) * time.Second,
TLSHandshakeTimeout: time.Duration(setting.DataProxyTLSHandshakeTimeout) * time.Second,
ExpectContinueTimeout: time.Duration(setting.DataProxyExpectContinueTimeout) * time.Second,
MaxConnsPerHost: setting.DataProxyMaxConnsPerHost,
MaxIdleConns: setting.DataProxyMaxIdleConns,
MaxIdleConnsPerHost: setting.DataProxyMaxIdleConnsPerHost,
IdleConnTimeout: time.Duration(setting.DataProxyIdleConnTimeout) * time.Second,