upstream/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-04-01 07:15:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix regression from #1957, specify non-zero default timeout. (#2121)

Browse source 
Fixes #2075
This commit is contained in:
Brian Brazil 2016-10-26 14:47:41 +01:00 committed by GitHub
parent 233a25a060
commit 6bc29ba857
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/prometheus/config.go
View file

@ -213,6 +213,11 @@ func init() {
"The name of the database to use for storing samples in InfluxDB.",
)
cfg.fs.DurationVar(
&cfg.remote.StorageTimeout, "storage.remote.timeout", 30*time.Second,
"The timeout to use when sending samples to the remote storage.",
)
// Alertmanager.
cfg.fs.Var(
&cfg.alertmanagerURLs, "alertmanager.url",