ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Fix netdev collector for linux (#890)

Browse source 
fix variable name, fix transmitHeader extracting
modify fixtures to run tests with updated netdev_linux collector

Signed-off-by: dmitriy-lukyanchikov <d.lukyanchikov@anchorfree.com>
This commit is contained in:
Dmitriy Lukyanchikov 2018-04-14 14:58:56 +03:00 • committed by Johannes 'fish' Ziemke
commit eddd1b9357
2 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
collector/netdev_linux.go
View file

@ -50,12 +50,15 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
scanner.Text())
}
header := strings.Fields(parts[1])
receiveHeader := strings.Fields(parts[1])
transmitHeader := strings.Fields(parts[2])
headerLength := len(receiveHeader)+len(transmitHeader)+1
netDev := map[string]map[string]string{}
for scanner.Scan() {
line := strings.TrimLeft(scanner.Text(), " ")
parts := procNetDevFieldSep.Split(line, -1)
if len(parts) != 2*len(header)+1 {
if len(parts) != headerLength {
return nil, fmt.Errorf("invalid line in net/dev: %s", scanner.Text())
}
@ -65,10 +68,13 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
continue
}
netDev[dev] = map[string]string{}
for i, v := range header {
netDev[dev]["receive_"+v] = parts[i+1]
netDev[dev]["transmit_"+v] = parts[i+1+len(header)]
}
for i := 0; i < len(receiveHeader); i++ {
netDev[dev]["receive_"+receiveHeader[i]] = parts[i+1]
}
for i := 0; i < len(transmitHeader); i++ {
netDev[dev]["transmit_"+transmitHeader[i]] = parts[i+1+len(receiveHeader)]
}
}
return netDev, scanner.Err()
}