Skip to content

Commit ce2b51f

Browse files
Sidecar: increase default prometheus timeout (#8192)
Adjust the default get-config timeout to match the default get-config interval. Signed-off-by: Michael Hoffmann <[email protected]>
1 parent 1a559f9 commit ce2b51f

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
1515

1616
### Changed
1717

18+
- [#8192](https://github.com/thanos-io/thanos/pull/8192) Sidecar: fix default get config timeout
19+
1820
### Removed
1921

2022
### Fixed

cmd/thanos/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (pc *prometheusConfig) registerFlag(cmd extkingpin.FlagClause) *prometheusC
136136
Default("30s").DurationVar(&pc.getConfigInterval)
137137
cmd.Flag("prometheus.get_config_timeout",
138138
"Timeout for getting Prometheus config").
139-
Default("5s").DurationVar(&pc.getConfigTimeout)
139+
Default("30s").DurationVar(&pc.getConfigTimeout)
140140
pc.httpClient = extflag.RegisterPathOrContent(
141141
cmd,
142142
"prometheus.http-client",

docs/components/sidecar.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Flags:
161161
https://thanos.io/tip/thanos/storage.md/#configuration
162162
--prometheus.get_config_interval=30s
163163
How often to get Prometheus config
164-
--prometheus.get_config_timeout=5s
164+
--prometheus.get_config_timeout=30s
165165
Timeout for getting Prometheus config
166166
--prometheus.http-client=<content>
167167
Alternative to 'prometheus.http-client-file'

0 commit comments

Comments
 (0)