Fix bad SNMP interface formatter

Fixes #3659
ntop · Mar 27, 2020 · c5f2303 · c5f2303
1 parent 35c6c21
commit c5f2303
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/scripts/callbacks/system/snmp_device.lua b/scripts/callbacks/system/snmp_device.lua
@@ -90,14 +90,13 @@ local function snmp_device_run_user_scripts(snmp_device)
       -- For each interface of the current device...
       for snmp_interface_index, snmp_interface in pairs(device_interfaces) do
 	 local if_type = snmp_iftype(snmp_interface.type)
-	 local do_call = true
 
 	 if(script.skip_virtual_interfaces and
 	       ((if_type == "propVirtual") or (if_type == "softwareLoopback"))) then
-	    do_call = false
+	    goto continue
 	 end
 
-	 if(do_call and conf.enabled) then
+	 if(conf.enabled) then
 	    local iface_entity = alerts_api.snmpInterfaceEntity(device_ip, snmp_interface_index)
 
 	    alerts_api.invokeScriptHook(script, confset_id, hook_fn, device_ip, snmp_interface_index, table.merge(snmp_interface, {
@@ -108,6 +107,8 @@ local function snmp_device_run_user_scripts(snmp_device)
 	       now = now,
 	    }))
 	 end
+
+	 ::continue::
       end
    end
 

diff --git a/scripts/lua/modules/alerts_api.lua b/scripts/lua/modules/alerts_api.lua
@@ -426,7 +426,7 @@ end
 function alerts_api.snmpInterfaceEntity(snmp_device, snmp_interface)
   return {
     alert_entity = alert_consts.alert_entities.snmp_device,
-    alert_entity_val = string.format("%s_ifidx%d", snmp_device, snmp_interface)
+    alert_entity_val = string.format("%s_ifidx%s", snmp_device, ""..snmp_interface)
   }
 end