Fixes duplicated interface shown (#8539)

ntop · Jul 22, 2024 · ad275ef · ad275ef
1 parent 19b1fca
commit ad275ef
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/http_src/vue/page-exporters-details.vue b/http_src/vue/page-exporters-details.vue
@@ -65,11 +65,11 @@ const map_table_def_columns = (columns) => {
 
             // Add timeseries icon if timeseries are enabled
             if (row['timeseries_enabled']) {
-                let timeseriesUrl = `${flowdevice_interface_url}ip=${get_ip_from_url()}&ts_schema=flowdev_port:traffic&page=historical&snmp_port_idx=${row.ifindex}&ifid=${props.context.ifid}`
+                let timeseriesUrl = `${flowdevice_interface_url}ip=${get_ip_from_url()}&ts_schema=flowdev_port:traffic&page=historical&snmp_port_idx=${row.ifindex}&ifid=${row.ifid}`
                 returnValue += `&nbsp;<a href=${timeseriesUrl}><i class="fas fa-chart-area fa-lg"></i></a>&nbsp;`
             }
 
-            let snmp_config = `${snmp_interface_config_url}ip=${get_ip_from_url()}&page=config&snmp_port_idx=${row.ifindex}&ifid=${props.context.ifid}`
+            let snmp_config = `${snmp_interface_config_url}ip=${get_ip_from_url()}&page=config&snmp_port_idx=${row.ifindex}&ifid=${row.ifid}`
             returnValue += `<a href=${snmp_config}><i class="fas fa-cog"></i></a>`
             
             return returnValue

diff --git a/http_src/vue/page-exporters.vue b/http_src/vue/page-exporters.vue
@@ -70,7 +70,7 @@ const map_table_def_columns = (columns) => {
                 returnValue += `&nbsp;<a href="${timeseriesUrl}"><i class="fas fa-chart-area fa-lg"></i></a>`;
             }
 
-            return `<a href="${host_url}ip=${value}&probe_uuid=${row.probe_uuid}">${returnValue}</a>`;
+            return `<a href="${host_url}ip=${value}&exporter_uuid=${row.exporter_uuid}&probe_uuid=${row.probe_uuid}">${returnValue}</a>`;
         },
 
         "name": (value, row) => {

diff --git a/scripts/lua/modules/http_lint.lua b/scripts/lua/modules/http_lint.lua
@@ -2667,6 +2667,7 @@ local known_parameters = {
    ["blacklist_name"] = validateUnquoted,
    ["reset_url"] = validateBool,
    ["as"] = validateNumber,
+   ["exporter_uuid"] = validateNumber,
    ["probe_uuid"] = validateNumber,
 
    -- nEdge policy

diff --git a/src/LuaEngineInterface.cpp b/src/LuaEngineInterface.cpp
@@ -2886,7 +2886,7 @@ static int ntop_get_flow_device_info(lua_State *vm) {
   ntop->getTrace()->traceEvent(TRACE_DEBUG, "%s() called", __FUNCTION__);
   lua_newtable(vm);
 
-  if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TSTRING) != CONST_LUA_OK)
+  if (ntop_lua_check(vm, __FUNCTION__, 1, LUA_TNUMBER) != CONST_LUA_OK)
     return (ntop_lua_return_value(vm, __FUNCTION__, CONST_LUA_ERROR));
   device_id = (u_int32_t )lua_tonumber(vm, 1);
   if (lua_type(vm, 2) == LUA_TBOOLEAN)

diff --git a/src/ZMQParserInterface.cpp b/src/ZMQParserInterface.cpp
@@ -499,7 +499,7 @@ u_int8_t ZMQParserInterface::parseEvent(const char *payload, int payload_size,
 	  if (json_object_object_get_ex(val, "num_drops", &x))
             exp_stats.num_drops = (u_int32_t)json_object_get_int64(x);
 
-          if (json_object_object_get_ex(val, "unique_source_id", &x))
+    if (json_object_object_get_ex(val, "unique_source_id", &x))
             exp_stats.unique_source_id = (u_int32_t)json_object_get_int64(x);
 
           zrs.exportersStats[ip] = exp_stats;