Skip to content

Commit

Permalink
InfluxDB output should not default to 'no timeout' for http writes
Browse files Browse the repository at this point in the history
default to 5s instead, since even if it times out we will cache the
points and move on

closes #685
  • Loading branch information
sparrc committed Feb 19, 2016
1 parent f9b5767 commit 65d5d8f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions etc/telegraf.conf
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
# note: using second precision greatly helps InfluxDB compression
precision = "s"

# Connection timeout (for the connection with InfluxDB), formatted as a string.
# If not provided, will default to 0 (no timeout)
# timeout = "5s"
## Write timeout (for the InfluxDB client), formatted as a string.
## If not provided, will default to 5s. 0s means no timeout (not recommended).
timeout = "5s"
# username = "telegraf"
# password = "metricsmetricsmetricsmetrics"
# Set the user agent for HTTP POSTs (can be useful for log differentiation)
Expand Down
10 changes: 6 additions & 4 deletions plugins/outputs/influxdb/influxdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ var sampleConfig = `
## note: using "s" precision greatly improves InfluxDB compression
precision = "s"
## Connection timeout (for the connection with InfluxDB), formatted as a string.
## If not provided, will default to 0 (no timeout)
# timeout = "5s"
## Write timeout (for the InfluxDB client), formatted as a string.
## If not provided, will default to 5s. 0s means no timeout (not recommended).
timeout = "5s"
# username = "telegraf"
# password = "metricsmetricsmetricsmetrics"
## Set the user agent for HTTP POSTs (can be useful for log differentiation)
Expand Down Expand Up @@ -185,6 +185,8 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {

func init() {
outputs.Add("influxdb", func() telegraf.Output {
return &InfluxDB{}
return &InfluxDB{
Timeout: internal.Duration{Duration: time.Second * 5},
}
})
}

0 comments on commit 65d5d8f

Please sign in to comment.