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

Increment gather_errors for all input errors 

closes #2339
This commit is contained in:
Cosmo Petrich 2017-01-30 09:28:52 +11:00 committed by Cameron Sparr
parent 1c4673e900
commit b1945c0493
No known key found for this signature in database
GPG Key ID: 19E67263DCB25D0F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -40,6 +40,7 @@ It is highly recommended that all users migrate to the new riemann output plugin
- [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state. - [#2277](https://github.com/influxdata/telegraf/pull/2277): add integer metrics for Consul check health state.
- [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin. - [#2201](https://github.com/influxdata/telegraf/pull/2201): Add lock option to the IPtables input plugin.
- [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors. - [#2244](https://github.com/influxdata/telegraf/pull/2244): Support ipmi_sensor plugin querying local ipmi sensors.
- [#2339](https://github.com/influxdata/telegraf/pull/2339): Increment gather_errors for all errors emitted by inputs.
### Bugfixes ### Bugfixes

8
agent/agent.go
View File

@ -157,13 +157,13 @@ func gatherWithTimeout(
select { select {
case err := <-done: case err := <-done:
if err != nil { if err != nil {
log.Printf("E! ERROR in input [%s]: %s", input.Name(), err) acc.AddError(err)
} }
return return
case <-ticker.C: case <-ticker.C:
log.Printf("E! ERROR: input [%s] took longer to collect than "+ err := fmt.Errorf("took longer to collect than collection interval (%s)",
"collection interval (%s)", timeout)
input.Name(), timeout) acc.AddError(err)
continue continue
case <-shutdown: case <-shutdown:
return return