From 6bc29ba857ee20f641beccbfbe32f8595eb18b6e Mon Sep 17 00:00:00 2001
From: Brian Brazil <brian-brazil@users.noreply.github.com>
Date: Wed, 26 Oct 2016 14:47:41 +0100
Subject: [PATCH] Fix regression from #1957, specify non-zero default timeout.
 (#2121)

Fixes #2075
---
 cmd/prometheus/config.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmd/prometheus/config.go b/cmd/prometheus/config.go
index 27d1268203..9e0f2eca12 100644
--- a/cmd/prometheus/config.go
+++ b/cmd/prometheus/config.go
@@ -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",