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

Update cli-srv label with alias if present in Historical Flows page. (#7254) (#7279)

Browse source
This commit is contained in:
Nicolò Maio 2023-03-01 12:45:50 +01:00 • committed by GitHub
parent 7bd8bb653e
commit 758d7ca3cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -744,6 +744,9 @@ local function dt_format_flow(processed_record, record)
local srv = processed_record["srv_ip"]
local vlan_id = processed_record["vlan_id"]
local cli_ip_alias = getHostAltName({host = cli["ip"], vlan = vlan_id})
local srv_ip_alias = getHostAltName({host = srv["ip"], vlan = vlan_id})
if cli and srv and _GET["visible_columns"] and string.find(_GET["visible_columns"], "flow") then
-- Add flow info to the processed_record, in place of cli_ip/srv_ip
local flow = {}
@ -753,10 +756,10 @@ local function dt_format_flow(processed_record, record)
-- Converting to the same format used for alert flows (see DataTableRenders.formatFlowTuple)
cli_ip["value"] = cli["ip"] -- IP address
cli_ip["name"] = cli["name"] -- Host name
cli_ip["label"] = cli["label"] -- Label - This can be shortened if required
cli_ip["label_long"] = cli["title"] -- Label - This is not shortened
cli_ip["value"] = cli["ip"] -- IP address
cli_ip["name"] = cli["name"] -- Host name
cli_ip["label"] = ternary(isEmptyString(cli_ip_alias), cli["label"], cli_ip_alias) -- Label - This can be shortened if required
cli_ip["label_long"] = cli["title"] -- Label - This is not shortened
cli_ip["reference"] = cli["reference"]
cli_ip["location"] = dt_format_location(record["CLIENT_LOCATION"])
@ -766,7 +769,7 @@ local function dt_format_flow(processed_record, record)
srv_ip["value"] = srv["ip"]
srv_ip["name"] = srv["name"]
srv_ip["label"] = srv["label"]
srv_ip["label"] = ternary(isEmptyString(srv_ip_alias), srv["label"], srv_ip_alias)
srv_ip["label_long"] = srv["title"]
srv_ip["reference"] = srv["reference"]
srv_ip["location"] = dt_format_location(record["SERVER_LOCATION"])