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

Fix flow status formatting when no flowstatus_info is available

Browse source
This commit is contained in:
emanuele-f 2019-03-28 11:59:14 +01:00
parent 58becaeebe
commit ad77797482
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2523,6 +2523,11 @@ end
function formatSuspiciousDeviceProtocolAlert(flowstatus_info)
local msg, devtype
if not flowstatus_info then
return i18n("alerts_dashboard.suspicious_device_protocol")
end
local discover = require("discover_utils")
local forbidden_proto = flowstatus_info["devproto_forbidden_id"] or 0
@ -2546,6 +2551,10 @@ function formatElephantFlowAlert(flowstatus_info, local2remote)
local threshold = ""
local res = ""
if not flowstatus_info then
return i18n("flow_details.elephant_flow")
end
if local2remote then
res = i18n("flow_details.elephant_flow_l2r")
@ -2574,13 +2583,15 @@ end
function formatLongLivedFlowAlert(flowstatus_info)
local threshold = ""
local res = i18n("flow_details.longlived_flow")
if not flowstatus_info then
return i18n("flow_details.longlived_flow")
end
if flowstatus_info["longlived.threshold"] then
threshold = flowstatus_info["longlived.threshold"]
end
res = string.format("%s<sup><i class='fa fa-info-circle' aria-hidden='true' title='"..i18n("flow_details.longlived_flow_descr").."'></i></sup>", res)
local res = string.format("%s<sup><i class='fa fa-info-circle' aria-hidden='true' title='"..i18n("flow_details.longlived_flow_descr").."'></i></sup>", res)
if threshold ~= "" then
res = string.format("%s [%s]", res, i18n("flow_details.longlived_exceeded", {amount = secondsToTime(threshold)}))
@ -2596,7 +2607,7 @@ function getFlowStatus(status, flowstatus_info, alert, no_icon)
local warn_sign = ternary(no_icon, "", "<i class=\"fa fa-warning\" aria-hidden=true style=\"color: orange;\"></i> ")
local res = warn_sign..i18n("flow_details.unknown_status",{status=status})
-- NOTE: flowstatus_info can be nil on older alerts
-- NOTE: flowstatus_info can be nil
if(status == 0) then res = i18n("flow_details.normal")
elseif(status == 1) then res = warn_sign..i18n("flow_details.slow_tcp_connection")
elseif(status == 2) then res = warn_sign..i18n("flow_details.slow_application_header")