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

darwin net plugin fix, really need to godep vendor gopsutil

This commit is contained in:
Cameron Sparr 2015-09-10 13:57:19 -06:00
parent f7a4317990
commit d8482cc286
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ will still be backwards compatible if only `url` is specified.
- [#170](https://github.com/influxdb/telegraf/issues/170): Systemd support - [#170](https://github.com/influxdb/telegraf/issues/170): Systemd support
- [#175](https://github.com/influxdb/telegraf/issues/175): Set write precision before gathering metrics - [#175](https://github.com/influxdb/telegraf/issues/175): Set write precision before gathering metrics
- [#178](https://github.com/influxdb/telegraf/issues/178): redis plugin, multiple server thread hang bug - [#178](https://github.com/influxdb/telegraf/issues/178): redis plugin, multiple server thread hang bug
- Fix net plugin on darwin
## v0.1.8 [2015-09-04] ## v0.1.8 [2015-09-04]

20
plugins/system/ps/net/net_darwin.go
View File

@ -7,7 +7,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/influxdb/telegraf/plugins/system/ps/common" "github.com/shirou/gopsutil/common"
) )
func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) { func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
@ -26,7 +26,7 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
// skip first line // skip first line
continue continue
} }
if common.StringContains(exists, values[0]) { if common.StringsHas(exists, values[0]) {
// skip if already get // skip if already get
continue continue
} }
@ -38,11 +38,14 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
base = 0 base = 0
} }
parsed := make([]uint64, 0, 3) parsed := make([]uint64, 0, 6)
vv := []string{ vv := []string{
values[base+3], // PacketsRecv values[base+3], // Ipkts == PacketsRecv
values[base+4], // Errin values[base+4], // Ierrs == Errin
values[base+5], // Dropin values[base+5], // Ibytes == BytesRecv
values[base+6], // Opkts == PacketsSent
values[base+7], // Oerrs == Errout
values[base+8], // Obytes == BytesSent
} }
for _, target := range vv { for _, target := range vv {
if target == "-" { if target == "-" {
@ -61,7 +64,10 @@ func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
Name: values[0], Name: values[0],
PacketsRecv: parsed[0], PacketsRecv: parsed[0],
Errin: parsed[1], Errin: parsed[1],
Dropin: parsed[2], BytesRecv: parsed[2],
PacketsSent: parsed[3],
Errout: parsed[4],
BytesSent: parsed[5],
} }
ret = append(ret, n) ret = append(ret, n)
} }