dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #1405 (#1406)

This commit is contained in:
Thibault Cohen 2016-06-23 03:59:14 -04:00 committed by Cameron Sparr
parent 7825df4771
commit b18134a4e3
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -36,6 +36,7 @@ should now look like:
- [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin. - [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin.
- [#1399](https://github.com/influxdata/telegraf/issues/1399): Add `read_repairs` statistics to riak plugin. - [#1399](https://github.com/influxdata/telegraf/issues/1399): Add `read_repairs` statistics to riak plugin.
- [#1405](https://github.com/influxdata/telegraf/issues/1405): Fix memory/connection leak in prometheus input plugin.
## v1.0 beta 2 [2016-06-21] ## v1.0 beta 2 [2016-06-21]

1
plugins/inputs/prometheus/prometheus.go
View File

@ -88,6 +88,7 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
InsecureSkipVerify: p.InsecureSkipVerify, InsecureSkipVerify: p.InsecureSkipVerify,
}, },
ResponseHeaderTimeout: time.Duration(3 * time.Second), ResponseHeaderTimeout: time.Duration(3 * time.Second),
DisableKeepAlives: true,
} }
if p.BearerToken != "" { if p.BearerToken != "" {