Improves visualization of containers/pods in flows

This commit is contained in:
Simone Mainardi 2019-06-27 17:00:17 +02:00
parent 57f56d1fc3
commit ae4770fe7d
4 changed files with 60 additions and 70 deletions

View file

@ -272,6 +272,7 @@ for _key, value in ipairs(flows_stats) do -- pairsByValues(vals, funct) do
local src_port, dst_port = '', ''
local src_process, dst_process = '', ''
local src_container, dst_container = '', ''
if(cli_name == nil) then cli_name = "???" end
if(srv_name == nil) then srv_name = "???" end
@ -300,15 +301,8 @@ for _key, value in ipairs(flows_stats) do -- pairsByValues(vals, funct) do
end
--record["column_client_process"] = flowinfo2process(value["client_process"], hostinfo2url(value,"cli"))
src_process = flowinfo2process(value["client_process"], hostinfo2url(value,"cli"))
if value["client_container"] and value["client_container"].id then
record["column_client_container"] = '<a href="' .. ntop.getHttpPrefix() .. '/lua/flows_stats.lua?container=' .. value["client_container"].id .. '">' .. format_utils.formatContainer(value["client_container"]) .. '</a>'
if value["client_container"]["k8s.pod"] then
record["column_client_pod"] = '<a href="' .. ntop.getHttpPrefix() .. '/lua/containers_stats.lua?pod=' .. value["client_container"]["k8s.pod"] .. '">' .. shortenString(value["client_container"]["k8s.pod"]) .. '</a>'
end
end
src_process = flowinfo2process(value["client_process"], hostinfo2url(value,"cli"))
src_container = flowinfo2container(value["client_container"])
else
src_key = shortenString(stripVlan(cli_name))
src_port=":"..value["cli.port"]
@ -326,7 +320,8 @@ for _key, value in ipairs(flows_stats) do -- pairsByValues(vals, funct) do
end
--record["column_server_process"] = flowinfo2process(value["server_process"], hostinfo2url(value,"srv"))
dst_process = flowinfo2process(value["server_process"], hostinfo2url(value,"srv"))
dst_process = flowinfo2process(value["server_process"], hostinfo2url(value,"srv"))
dst_container = flowinfo2container(value["server_container"])
if value["server_container"] and value["server_container"].id then
record["column_server_container"] = '<a href="' .. ntop.getHttpPrefix() .. '/lua/flows_stats.lua?container=' .. value["server_container"].id .. '">' .. format_utils.formatContainer(value["server_container"]) .. '</a>'
@ -375,11 +370,10 @@ for _key, value in ipairs(flows_stats) do -- pairsByValues(vals, funct) do
column_client = column_client..getFlag(info["country"])
end
column_client = string.format("%s%s%s %s",
column_client = string.format("%s%s%s %s %s",
column_client,
ternary(src_port ~= '', ':', ''),
src_port,
src_process)
src_port, src_process, src_container)
if(value["verdict.pass"] == false) then
column_client = "<strike>"..column_client.."</strike>"
end
@ -401,11 +395,10 @@ for _key, value in ipairs(flows_stats) do -- pairsByValues(vals, funct) do
column_server = column_server..getFlag(info["country"])
end
column_server = string.format("%s%s%s %s",
column_server = string.format("%s%s%s %s %s",
column_server,
ternary(dst_port ~= '', ':', ''),
dst_port,
dst_process)
dst_port, dst_process, dst_container)
if(value["verdict.pass"] == false) then
column_server = "<strike>"..column_server.."</strike>"
end