From 5a86a2ff26e45750a501aad688d0b855228bd817 Mon Sep 17 00:00:00 2001 From: Patrick Hemmer Date: Thu, 6 Oct 2016 09:23:51 -0400 Subject: [PATCH] snmp: return error on unknown conversion type (#1853) --- plugins/inputs/snmp/snmp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go index 213002e92..6ee257c81 100644 --- a/plugins/inputs/snmp/snmp.go +++ b/plugins/inputs/snmp/snmp.go @@ -716,7 +716,6 @@ func (s *Snmp) getConnection(agent string) (snmpConnection, error) { // "hwaddr" will convert the value into a MAC address. // "ipaddr" will convert the value into into an IP address. // "" will convert a byte slice into a string. -// Any other conv will return the input value unchanged. func fieldConvert(conv string, v interface{}) (interface{}, error) { if conv == "" { if bs, ok := v.([]byte); ok { @@ -805,6 +804,7 @@ func fieldConvert(conv string, v interface{}) (interface{}, error) { default: return nil, fmt.Errorf("invalid type (%T) for hwaddr conversion", v) } + return v, nil } if conv == "ipaddr" { @@ -829,7 +829,7 @@ func fieldConvert(conv string, v interface{}) (interface{}, error) { return v, nil } - return v, nil + return nil, fmt.Errorf("invalid conversion type '%s'", conv) } // snmpTranslate resolves the given OID.