vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 07:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove guessed column in aggregated live flows and other fix. (#7667)

Browse source
This commit is contained in:
Nicolo Maio 2023-07-14 09:58:40 +00:00
parent 8232d0ac79
commit af95cd7ff0
5 changed files with 93 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/lua/rest/v2/get/flow/aggregated_live_flows.lua
View file

@ -81,7 +81,9 @@ local criteria_type_id = 1 -- by default application_protocol
if criteria == "client" then
criteria_type_id = 2
elseif criteria == "server" then
criteria_type_id = 3
criteria_type_id = 3
elseif criteria == "client_server_srv_port" then
criteria_type_id = 7
elseif ntop.isEnterpriseM() then
criteria_type_id = get_criteria_type_id(criteria)
end
@ -100,6 +102,7 @@ for _, data in pairs(aggregated_info or {}) do
local add_app_proto = false
local add_server = false
local add_client = false
local add_server_port = false
local client = nil
local server = nil
local info = nil
@ -132,6 +135,16 @@ for _, data in pairs(aggregated_info or {}) do
if(data.server_ip ~= nil) then
add_server = true
end
elseif (criteria_type_id == 7) then
if(data.server_ip ~= nil) then
add_server = true
end
if(data.client_ip ~= nil) then
add_client = true
end
if(data.srv_port ~= nil) then
add_server_port = true
end
elseif ntop.isEnterpriseM() then
response = get_output_flags(criteria_type_id)
end
@ -144,7 +157,7 @@ for _, data in pairs(aggregated_info or {}) do
}
end
if (response ~= {} and response.add_srv_port) then
if (add_server_port) then
srv_port = {
label = data.srv_port,
id = data.srv_port