CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.snmp): Fix crash when trying to format fields from unknown OIDs (#16155)

This commit is contained in:
Thomas Casteleyn 2024-11-07 15:18:39 +01:00 committed by GitHub
parent 18b2d3cdc3
commit 58b4126f0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/snmp/translator_gosmi.go
View File

@ -12,6 +12,8 @@ import (
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
) )
var errCannotFormatUnkownType = errors.New("cannot format value, unknown type")
type gosmiTranslator struct { type gosmiTranslator struct {
} }
@ -64,6 +66,10 @@ func (g *gosmiTranslator) SnmpFormatEnum(oid string, value interface{}, full boo
return "", err return "", err
} }
if node.Type == nil {
return "", errCannotFormatUnkownType
}
var v models.Value var v models.Value
if full { if full {
v = node.FormatValue(value, models.FormatEnumName, models.FormatEnumValue) v = node.FormatValue(value, models.FormatEnumName, models.FormatEnumValue)
@ -71,7 +77,7 @@ func (g *gosmiTranslator) SnmpFormatEnum(oid string, value interface{}, full boo
v = node.FormatValue(value, models.FormatEnumName) v = node.FormatValue(value, models.FormatEnumName)
} }
return v.Formatted, nil return v.String(), nil
} }
func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (string, error) { func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (string, error) {
@ -85,9 +91,11 @@ func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (
return "", err return "", err
} }
v := node.FormatValue(value) if node.Type == nil {
return "", errCannotFormatUnkownType
}
return v.Formatted, nil return node.FormatValue(value).String(), nil
} }
func getIndex(mibPrefix string, node gosmi.SmiNode) (col []string, tagOids map[string]struct{}) { func getIndex(mibPrefix string, node gosmi.SmiNode) (col []string, tagOids map[string]struct{}) {