Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
titilambert committed Jun 22, 2016
1 parent 7825df4 commit 3cb9fcf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ should now look like:

- [#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.
- [#1405](https://github.com/influxdata/telegraf/issues/1405): Fix memory/connection leak in prometheus input plugin.

## v1.0 beta 2 [2016-06-21]

Expand Down
1 change: 1 addition & 0 deletions plugins/inputs/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
InsecureSkipVerify: p.InsecureSkipVerify,
},
ResponseHeaderTimeout: time.Duration(3 * time.Second),
DisableKeepAlives: true,
}

if p.BearerToken != "" {
Expand Down

0 comments on commit 3cb9fcf

Please sign in to comment.