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

Add device name as a tag in disk stats (#1807)

Browse Source 
* return partition stat alongside disk stat from disk usage method, and report device name (minus /dev/) as a tag in disk stats

* update system/disk tests to include new partition stat return value from disk usage method calls

* update changelog for #1807 (use device name instead of path to report disk stats)
This commit is contained in:
Nathan D Acuff
2016-12-05 12:42:36 -05:00
committed by Cameron Sparr
parent 1d1afe6481
commit d518d7d806
5 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inputs/system/disk.go
View File

@@ -2,6 +2,7 @@ package system
import (
"fmt"
"strings"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
@@ -41,18 +42,19 @@ func (s *DiskStats) Gather(acc telegraf.Accumulator) error {
s.MountPoints = s.Mountpoints
}
disks, err := s.ps.DiskUsage(s.MountPoints, s.IgnoreFS)
disks, partitions, err := s.ps.DiskUsage(s.MountPoints, s.IgnoreFS)
if err != nil {
return fmt.Errorf("error getting disk usage info: %s", err)
}
for _, du := range disks {
for i, du := range disks {
if du.Total == 0 {
// Skip dummy filesystem (procfs, cgroupfs, ...)
continue
}
tags := map[string]string{
"path": du.Path,
"device": strings.Replace(partitions[i].Device, "/dev/", "", -1),
"fstype": du.Fstype,
}
var used_percent float64