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

fix snmp emitting empty fields

Browse Source 
closes #1848
closes #1835
This commit is contained in:
Patrick Hemmer
2016-10-04 10:46:01 -04:00
committed by Cameron Sparr
parent 9feb639bbd
commit b48ad4b737
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/inputs/snmp/snmp.go
View File

@@ -460,13 +460,15 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
// index, and being added on the same row.
if pkt, err := gs.Get([]string{oid}); err != nil {
return nil, Errorf(err, "performing get")
} else if pkt != nil && len(pkt.Variables) > 0 && pkt.Variables[0].Type != gosnmp.NoSuchObject {
} else if pkt != nil && len(pkt.Variables) > 0 && pkt.Variables[0].Type != gosnmp.NoSuchObject && pkt.Variables[0].Type != gosnmp.NoSuchInstance {
ent := pkt.Variables[0]
fv, err := fieldConvert(f.Conversion, ent.Value)
if err != nil {
return nil, Errorf(err, "converting %q", ent.Value)
}
ifv[""] = fv
if fvs, ok := fv.(string); !ok || fvs != "" {
ifv[""] = fv
}
}
} else {
err := gs.Walk(oid, func(ent gosnmp.SnmpPDU) error {
@@ -487,7 +489,9 @@ func (t Table) Build(gs snmpConnection, walk bool) (*RTable, error) {
if err != nil {
return Errorf(err, "converting %q", ent.Value)
}
ifv[idx] = fv
if fvs, ok := fv.(string); !ok || fvs != "" {
ifv[idx] = fv
}
return nil
})
if err != nil {