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

Use name filter for IOCounters in diskio (#2649)

Browse Source 
Use IOCountersForNames for disk counters.
This commit is contained in:
Daniel Nelson
2017-04-11 11:41:09 -07:00
committed by GitHub
parent 516dffa4c4
commit f55af7d21f
5 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,25 +125,12 @@ func (_ *DiskIOStats) SampleConfig() string {
}
func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error {
diskio, err := s.ps.DiskIO()
diskio, err := s.ps.DiskIO(s.Devices)
if err != nil {
return fmt.Errorf("error getting disk io info: %s", err)
}
var restrictDevices bool
devices := make(map[string]bool)
if len(s.Devices) != 0 {
restrictDevices = true
for _, dev := range s.Devices {
devices[dev] = true
}
}
for _, io := range diskio {
_, member := devices[io.Name]
if restrictDevices && !member {
continue
}
tags := map[string]string{}
tags["name"] = s.diskName(io.Name)
for t, v := range s.diskTags(io.Name) {

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

@@ -61,7 +61,7 @@ func (m *MockPS) NetProto() ([]net.ProtoCountersStat, error) {
return r0, r1
}
func (m *MockPS) DiskIO() (map[string]disk.IOCountersStat, error) {
func (m *MockPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
ret := m.Called()
r0 := ret.Get(0).(map[string]disk.IOCountersStat)

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

@@ -17,7 +17,7 @@ type PS interface {
DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.UsageStat, []*disk.PartitionStat, error)
NetIO() ([]net.IOCountersStat, error)
NetProto() ([]net.ProtoCountersStat, error)
DiskIO() (map[string]disk.IOCountersStat, error)
DiskIO(names []string) (map[string]disk.IOCountersStat, error)
VMStat() (*mem.VirtualMemoryStat, error)
SwapStat() (*mem.SwapMemoryStat, error)
NetConnections() ([]net.ConnectionStat, error)
@@ -120,8 +120,8 @@ func (s *systemPS) NetConnections() ([]net.ConnectionStat, error) {
return net.Connections("all")
}
func (s *systemPS) DiskIO() (map[string]disk.IOCountersStat, error) {
m, err := disk.IOCounters()
func (s *systemPS) DiskIO(names []string) (map[string]disk.IOCountersStat, error) {
m, err := disk.IOCountersForNames(names)
if err == internal.NotImplementedError {
return nil, nil
}