From 9d6b945e415b52c04eba9790da42f072a8cbc0f0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 11 Sep 2017 09:08:26 +0000 Subject: [PATCH] Default HTTP keep-alive ON for remote read/write --- config/config.go | 2 +- storage/remote/client.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index 626fd3d1e..401bee4f4 100644 --- a/config/config.go +++ b/config/config.go @@ -526,7 +526,7 @@ type HTTPClientConfig struct { ProxyURL URL `yaml:"proxy_url,omitempty"` // TLSConfig to use to connect to the targets. TLSConfig TLSConfig `yaml:"tls_config,omitempty"` - // If set, override whether to use HTTP KeepAlive - defaults OFF + // If set, override whether to use HTTP KeepAlive - scraping defaults OFF, remote read/write defaults ON KeepAlive *bool `yaml:"keep_alive,omitempty"` // Catches all undefined fields and must be empty after parsing. diff --git a/storage/remote/client.go b/storage/remote/client.go index fc60cfba6..1a20dc43a 100644 --- a/storage/remote/client.go +++ b/storage/remote/client.go @@ -51,6 +51,11 @@ type clientConfig struct { // NewClient creates a new Client. func NewClient(index int, conf *clientConfig) (*Client, error) { + // If not specified in config, allow HTTP connections for remote API to use keep-alive + if conf.httpClientConfig.KeepAlive == nil { + val := true + conf.httpClientConfig.KeepAlive = &val + } httpClient, err := httputil.NewClientFromConfig(conf.httpClientConfig) if err != nil { return nil, err