vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Changed flow exporter names dropdown (#6768)

Browse source
This commit is contained in:
MatteoBiscosi 2022-07-07 16:56:39 +02:00
parent b74cac3c61
commit 7137afd1ca
2 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scripts/lua/modules/lua_utils.lua
View file

@ -683,11 +683,11 @@ end
-- ##############################################
function getProbesName(flowdevs)
function getProbesName(flowdevs, show_vlan, shorten_len)
local devips = {}
for dip, _ in pairsByValues(flowdevs, asc) do
devips[dip] = getProbeName(dip)
devips[dip] = getProbeName(dip, show_vlan, shorten_len)
end
return devips
@ -695,7 +695,7 @@ end
-- ##############################################
function getProbeName(exporter_ip)
function getProbeName(exporter_ip, show_vlan, shorten_len)
local cached_device_name
local snmp_cached_dev
@ -711,7 +711,7 @@ function getProbeName(exporter_ip)
cached_device_name = cached_device_name["name"]
else
local hinfo = hostkey2hostinfo(exporter_ip)
local exporter_label = hostinfo2label(hinfo)
local exporter_label = hostinfo2label(hinfo, show_vlan, shorten_len)
if not isEmptyString(exporter_label) then
cached_device_name = exporter_label
@ -5497,6 +5497,22 @@ function format_location_badge(location)
return loc
end
-- ##############################################
function format_name_value(name, value, shorten)
local formatted_name_value = value
if not isEmptyString(name) and name ~= value then
if (shorten) and (shorten == true) then
formatted_name_value = shortenString(name) .. " [" .. value .. "]"
else
tprint(name)
formatted_name_value = name .. " [" .. value .. "]"
end
end
return formatted_name_value
end
--
-- IMPORTANT