vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 19:15:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Various AS aggregation fixes

Browse source
This commit is contained in:
Luca Deri 2025-09-12 19:34:29 +02:00
parent a295aac57d
commit edd42b6527
3 changed files with 107 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

36
scripts/lua/modules/flow_data.lua
View file

@ -3,9 +3,9 @@
--
local dirs = ntop.getDirs()
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
if ntop.isPro() then
package.path = dirs.installdir .. "/scripts/lua/pro/modules/?.lua;" ..
package.path
package.path = dirs.installdir .. "/scripts/lua/pro/modules/?.lua;" .. package.path
end
local flow_data = {}
@ -83,8 +83,7 @@ local function formatEmptyStats(columns, flow, rename_field_list,
end
if trace_stats then
trace_string = string.format("%s [%s: %s]", trace_string,
key,
tostring(element[key] or ""))
key, tostring(element[key] or ""))
end
end
else
@ -153,21 +152,16 @@ function flow_data.getStats(queries, isHistorical)
interface.aggregateASNFlows()
end
end
for _, query_info in pairs(queries or {}) do
local isHistorical = false
if (query_info.filters and query_info.filters.last_seen) then
isHistorical = true
end
local select_columns = flow_data_preset.retrieveColumns(
query_info.select_query)
local sort_columns =
flow_data_preset.retrieveColumns(query_info.sort_by) or {}
local where_filters = flow_data_preset.convertFilters(
query_info.where_query, query_info.filters,
isHistorical)
local different_columns = flow_data_preset.retrieveColumns(
query_info.different_from)
local select_columns = flow_data_preset.retrieveColumns(query_info.select_query)
local sort_columns = flow_data_preset.retrieveColumns(query_info.sort_by) or {}
local where_filters = flow_data_preset.convertFilters(query_info.where_query, query_info.filters, isHistorical)
local different_columns = flow_data_preset.retrieveColumns(query_info.different_from)
-- Function used to, given a flow, merge all the same data togheter
local function formatData(_, flow)
@ -192,21 +186,21 @@ function flow_data.getStats(queries, isHistorical)
end
-- Now update the data (e.g. bytes_sent and bytes_rcvd)
results[key] = updateStats(select_columns,
query_info.invert_direction, flow,
results[key])
results[key] = updateStats(select_columns, query_info.invert_direction, flow, results[key])
::skip_flow::
end
local first_seen = query_info.filters.first_seen
local last_seen = query_info.filters.last_seen
local query_result = flow_data_historical.retrieveFlowData(
select_columns, where_filters, sort_columns,
query_info.invert_direction, first_seen,
last_seen, isHistorical)
local query_result = flow_data_historical.retrieveFlowData(select_columns, where_filters, sort_columns,
query_info.invert_direction, first_seen,
last_seen, isHistorical)
for _, flow in pairs(query_result or {}) do formatData(_, flow) end
end
--tprint(results)
-- Now we have equal table for live and historical, so now format the data and run the checks
return results
end

13
scripts/lua/modules/flow_data_preset.lua
View file

@ -213,12 +213,13 @@ end
-- @param where Array, containing a list of ids for the where
-- @param available_filters List, containing a list filters, key is the key of the filter, value is the value
-- @return a list of filters, key - value
function flow_data_preset.convertFilters(where, available_filters)
local where_query = {}
function flow_data_preset.convertFilters(where, available_filters, isHistorical)
local where_query = {}
if (not available_filters) or (table.len(available_filters) == 0) then
return where_query
end
end
for _, key in pairs(where or {}) do
if (columns[key] and columns[key]["filters"]) then
local filter = columns[key]["filters"]
@ -240,13 +241,13 @@ function flow_data_preset.convertFilters(where, available_filters)
end
end
end
-- Ifid filter is mandatory, add it in case it's missing, only in live data
if not where_query["ifid"] and not where_query["INTERFACE_ID"] then
local ifid = available_filters["ifid"] or interface.getId() -- Use current ifid
where_query["INTERFACE_ID"] = ifid
end
return where_query
end