make default timeout more conservative

grafana · Apr 17, 2017 · ac51cdb · ac51cdb
1 parent 72ff8c1
commit ac51cdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/grafana-net.md b/docs/grafana-net.md
@@ -48,7 +48,7 @@ other options can appear after the schemasFile, space-separated.
 * bufSize: how many metrics we can queue up in the route before providing backpressure (default 1e7 i.e. 10 million)
 * flushMaxNum: after this many metrics have queued up, trigger a flush (default 10k)
 * flushMaxWait: after this many milliseconds, trigger a flush (default 500)
-* timeout: after how many milliseconds to consider a request to the hosted metrics to timeout, so that it will retry later (default 2000)
+* timeout: after how many milliseconds to consider a request to the hosted metrics to timeout, so that it will retry later (default 5000)
 * sslverify: disables ssl verifications, useful for test/POC setups with self signed ssl certificates (default true)
 * concurrency: how many independent workers pushing data to grafanacloud (default 10)
 
diff --git a/imperatives/imperatives.go b/imperatives/imperatives.go
@@ -314,7 +314,7 @@ func readAddRouteGrafanaNet(s *toki.Scanner, table *tbl.Table) error {
 	var bufSize = int(1e7)  // since a message is typically around 100B this is 1GB
 	var flushMaxNum = 10000 // number of metrics
 	var flushMaxWait = 500  // in ms
-	var timeout = 2000      // in ms
+	var timeout = 5000      // in ms
 	var concurrency = 10    // number of concurrent connections to tsdb-gw
 	var orgId = 1