From 2328e4cabc06b550baf233bde609dc5af77cb64d Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Fri, 11 Aug 2023 04:51:57 -0700
Subject: [PATCH] app/vmagent/remotewrite: keep in sync the default value for
-remoteWrite.sendTimeout option in the description with the actually used
timeout
This is a follow-up for aef31f201a85e993dcae448a52927868f0fad9ea
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4776
---
app/vmagent/remotewrite/client.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/vmagent/remotewrite/client.go b/app/vmagent/remotewrite/client.go
index 6340da4635..5b2826f516 100644
--- a/app/vmagent/remotewrite/client.go
+++ b/app/vmagent/remotewrite/client.go
@@ -29,8 +29,9 @@ var (
rateLimit = flagutil.NewArrayInt("remoteWrite.rateLimit", "Optional rate limit in bytes per second for data sent to the corresponding -remoteWrite.url. "+
"By default, the rate limit is disabled. It can be useful for limiting load on remote storage when big amounts of buffered data "+
"is sent after temporary unavailability of the remote storage")
- sendTimeout = flagutil.NewArrayDuration("remoteWrite.sendTimeout", "Timeout for sending a single block of data to the corresponding -remoteWrite.url (default 1m)")
- proxyURL = flagutil.NewArrayString("remoteWrite.proxyURL", "Optional proxy URL for writing data to the corresponding -remoteWrite.url. "+
+ sendTimeout = flagutil.NewArrayDuration("remoteWrite.sendTimeout", "Timeout for sending a single block of data to the corresponding -remoteWrite.url (default "+
+ defaultSendTimeout.String()+")")
+ proxyURL = flagutil.NewArrayString("remoteWrite.proxyURL", "Optional proxy URL for writing data to the corresponding -remoteWrite.url. "+
"Supported proxies: http, https, socks5. Example: -remoteWrite.proxyURL=socks5://proxy:1234")
tlsInsecureSkipVerify = flagutil.NewArrayBool("remoteWrite.tlsInsecureSkipVerify", "Whether to skip tls verification when connecting to the corresponding -remoteWrite.url")
@@ -72,6 +73,8 @@ var (
awsSecretKey = flagutil.NewArrayString("remoteWrite.aws.secretKey", "Optional AWS SecretKey to use for the corresponding -remoteWrite.url if -remoteWrite.aws.useSigv4 is set")
)
+const defaultSendTimeout = time.Minute
+
type client struct {
sanitizedURL string
remoteWriteURL string
@@ -134,7 +137,7 @@ func newHTTPClient(argIdx int, remoteWriteURL, sanitizedURL string, fq *persiste
}
hc := &http.Client{
Transport: tr,
- Timeout: sendTimeout.GetOptionalArgOrDefault(argIdx, time.Minute),
+ Timeout: sendTimeout.GetOptionalArgOrDefault(argIdx, defaultSendTimeout),
}
c := &client{
sanitizedURL: sanitizedURL,