From 8a4eed5fb6666432d2612e51a290954f98381480 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 31 May 2022 12:38:54 -0400 Subject: [PATCH] Datasource: Remove deprecated max_idle_connections_per_host setting (#49948) (#49951) (cherry picked from commit b03657b0e04697fe384fd41d7ad82066f5bf58e3) Co-authored-by: Marcus Efraimsson --- docs/sources/administration/configuration.md | 6 ------ pkg/setting/setting_data_proxy.go | 5 ----- 2 files changed, 11 deletions(-) diff --git a/docs/sources/administration/configuration.md b/docs/sources/administration/configuration.md index 857fd5bd37d..e0a5eb71766 100644 --- a/docs/sources/administration/configuration.md +++ b/docs/sources/administration/configuration.md @@ -434,12 +434,6 @@ For more details check the [Transport.MaxConnsPerHost](https://golang.org/pkg/ne The maximum number of idle connections that Grafana will maintain. Default is `100`. For more details check the [Transport.MaxIdleConns](https://golang.org/pkg/net/http/#Transport.MaxIdleConns) documentation. -### max_idle_connections_per_host - -[Deprecated - use max_idle_connections instead] - -The maximum number of idle connections per host that Grafana will maintain. Default is `2`. For more details check the [Transport.MaxIdleConnsPerHost](https://golang.org/pkg/net/http/#Transport.MaxIdleConnsPerHost) documentation. - ### idle_conn_timeout_seconds The length of time that Grafana maintains idle connections before closing them. Default is `90` seconds. For more details check the [Transport.IdleConnTimeout](https://golang.org/pkg/net/http/#Transport.IdleConnTimeout) documentation. diff --git a/pkg/setting/setting_data_proxy.go b/pkg/setting/setting_data_proxy.go index f879b4c9093..580eb8eadd4 100644 --- a/pkg/setting/setting_data_proxy.go +++ b/pkg/setting/setting_data_proxy.go @@ -23,10 +23,5 @@ func readDataProxySettings(iniFile *ini.File, cfg *Cfg) error { cfg.DataProxyRowLimit = defaultDataProxyRowLimit } - if val, err := dataproxy.Key("max_idle_connections_per_host").Int(); err == nil { - cfg.Logger.Warn("[Deprecated] the configuration setting 'max_idle_connections_per_host' is deprecated, please use 'max_idle_connections' instead") - cfg.DataProxyMaxIdleConns = val - } - return nil }