reworking debug level logging for snmp

Author: i3149

pkg/inputs/snmp/metadata/interface_metadata.go

@@ -54,9 +54,10 @@ type InterfaceMetadata struct {
 	log           logger.ContextL
 	mibs          map[string]*kt.Mib
 	interfaceOids *orderedmap.OrderedMap
+	debug         bool
 }
 
-func NewInterfaceMetadata(interfaceMetadataMibs map[string]*kt.Mib, log logger.ContextL) *InterfaceMetadata {
+func NewInterfaceMetadata(interfaceMetadataMibs map[string]*kt.Mib, log logger.ContextL, debug bool) *InterfaceMetadata {
 	mibs := map[string]*kt.Mib{}
 	m := orderedmap.NewOrderedMap()
 
@@ -65,7 +66,6 @@ func NewInterfaceMetadata(interfaceMetadataMibs map[string]*kt.Mib, log logger.C
 		m.Set(el.Key, el.Value)
 	}
 
-
 	if len(interfaceMetadataMibs) > 0 {
 		oids := getFromCustomMap(interfaceMetadataMibs)
 		for _, oid := range oids {
@@ -88,6 +88,7 @@ func NewInterfaceMetadata(interfaceMetadataMibs map[string]*kt.Mib, log logger.C
 
 	return &InterfaceMetadata{
 		log:           log,
+		debug:         debug,
 		mibs:          mibs,
 		interfaceOids: m,
 	}
@@ -116,7 +117,9 @@ func (im *InterfaceMetadata) Poll(ctx context.Context, conf *kt.SnmpDeviceConfig
 
 		for _, variable := range results {
 			parts := strings.Split(variable.Name, oidVal)
-			im.log.Debugf("SNMP %v:%+v", variable.Name, variable.Value)
+			if im.debug {
+				im.log.Debugf("SNMP %v:%+v", variable.Name, variable.Value)
+			}
 			if len(parts) != 2 || len(parts[1]) == 0 {
 				continue
 			}
@@ -382,7 +385,9 @@ func (im *InterfaceMetadata) UpdateForHuawei(server *gosnmp.GoSNMP, d *kt.Device
 	id2snmp := map[string]string{}
 	for _, variable := range results {
 		prts := strings.Split(variable.Name, SNMP_HUAWEI_ID_MAP_OID)
-		im.log.Debugf("[API] ", "SNMP %+v:%+v", variable.Name, variable.Value)
+		if im.debug {
+			im.log.Debugf("[API] ", "SNMP %+v:%+v", variable.Name, variable.Value)
+		}
 		if len(prts) == 2 {
 			// variable.Name looks like this: .<oid>.<intVal> (.1.3.6.1.2.1.31.1.1.1.10.219)
 			oidIdx := prts[1][1:]

pkg/inputs/snmp/metadata/poll.go

@@ -103,7 +103,7 @@ func NewPoller(server *gosnmp.GoSNMP, gconf *kt.SnmpGlobalConfig, conf *kt.SnmpD
 		log:                   log,
 		server:                server,
 		interval:              DEFAULT_INTERVAL,
-		interfaceMetadata:     NewInterfaceMetadata(interfaceMetadataMibs, log),
+		interfaceMetadata:     NewInterfaceMetadata(interfaceMetadataMibs, log, conf.Debug),
 		deviceMetadata:        NewDeviceMetadata(deviceMetadataMibs, gconf, conf, metrics, log),
 		jchfChan:              jchfChan,
 		metrics:               metrics,

pkg/inputs/snmp/util/adaptor.go

@@ -154,10 +154,10 @@ func InitSNMP(device *kt.SnmpDeviceConfig, connectTimeout time.Duration, retries
 	if device.Debug {
 		server.Logger = gosnmp.NewLogger(logWrapper{
 			print: func(v ...interface{}) {
-				log.Debugf("GoSNMP: [hostname=" + device.DeviceName + "]" + fmt.Sprint(v...))
+				log.Debugf("GoSNMP: [hostname=" + device.DeviceName + "] " + fmt.Sprint(v...))
 			},
 			printf: func(format string, v ...interface{}) {
-				log.Debugf("GoSNMP: [hostname="+device.DeviceName+"]"+format, v...)
+				log.Debugf("GoSNMP: [hostname="+device.DeviceName+"] "+format, v...)
 			},
 		})
 	}

pkg/inputs/snmp/util/util.go

@@ -177,7 +177,9 @@ func WalkOID(ctx context.Context, device *kt.SnmpDeviceConfig, oid string, serve
 			if i > 0 {
 				log.Infof("%s SNMP retry %d on OID %s succeeded", logName, i, oid)
 			}
-			log.Debugf("(%s) polling %s using %s took %v. attempt %d of %d.", device.DeviceIP, oid, runtime.FuncForPC(reflect.ValueOf(try.walk).Pointer()).Name(), time.Now().Sub(st), i, len(tries))
+			if device.Debug {
+				log.Debugf("(%s) polling %s using %s took %v. attempt %d of %d.", device.DeviceIP, oid, runtime.FuncForPC(reflect.ValueOf(try.walk).Pointer()).Name(), time.Now().Sub(st), i, len(tries))
+			}
 			return results, nil
 		}