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

Merge branch 'dev' into update-mac-tracking

Browse source
This commit is contained in:
Nicolo Maio 2023-05-05 13:16:56 +00:00
commit 51c990b6ab
9 changed files with 7323 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ package.path = dirs.installdir .. "/scripts/lua/pro/enterprise/modules/?.lua;" .
require "lua_utils"
local rest_utils = require("rest_utils")
local format_utils = require("format_utils")
require "lua_utils_get"
if ntop.isEnterpriseM() then
require "aggregate_live_flows"
@ -205,6 +206,9 @@ for _, data in pairs(aggregated_info or {}) do
server = server,
info = info,
application = application,
app_proto_is_not_guessed = data.is_not_guessed,
confidence_name = get_confidence(ternary(application.id == "0", "-1", ternary(data.is_not_guessed, "1", "0"))),
confidence = ternary(data.is_not_guessed, 1, 0),
vlan_id = {
id = data.vlan_id,
label = ternary(data.vlan_id, getFullVlanName(data.vlan_id), "")