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

Disk plugin: return immediately if usage fails 

closes #1297
This commit is contained in:
Cameron Sparr 2016-05-31 16:58:41 +01:00
parent c4cfdb8a25
commit 0aff7a0bc1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -44,6 +44,7 @@ time before a new metric is included by the plugin.
- [#1258](https://github.com/influxdata/telegraf/pull/1258): Fix potential kernel plugin integer parse error. - [#1258](https://github.com/influxdata/telegraf/pull/1258): Fix potential kernel plugin integer parse error.
- [#1268](https://github.com/influxdata/telegraf/pull/1268): Fix potential influxdb input type assertion panic. - [#1268](https://github.com/influxdata/telegraf/pull/1268): Fix potential influxdb input type assertion panic.
- [#1283](https://github.com/influxdata/telegraf/pull/1283): Still send processes metrics if a process exited during metric collection. - [#1283](https://github.com/influxdata/telegraf/pull/1283): Still send processes metrics if a process exited during metric collection.
- [#1297](https://github.com/influxdata/telegraf/issues/1297): disk plugin panic when usage grab fails.
## v0.13.1 [2016-05-24] ## v0.13.1 [2016-05-24]

2
plugins/inputs/system/ps.go
View File

@ -84,10 +84,10 @@ func (s *systemPS) DiskUsage(
mountpoint := os.Getenv("HOST_MOUNT_PREFIX") + p.Mountpoint mountpoint := os.Getenv("HOST_MOUNT_PREFIX") + p.Mountpoint
if _, err := os.Stat(mountpoint); err == nil { if _, err := os.Stat(mountpoint); err == nil {
du, err := disk.Usage(mountpoint) du, err := disk.Usage(mountpoint)
du.Path = p.Mountpoint
if err != nil { if err != nil {
return nil, err return nil, err
} }
du.Path = p.Mountpoint
// If the mount point is a member of the exclude set, // If the mount point is a member of the exclude set,
// don't gather info on it. // don't gather info on it.
_, ok := fstypeExcludeSet[p.Fstype] _, ok := fstypeExcludeSet[p.Fstype]