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

Rework host label getters

Browse source 
This fixes inconsistencies across the ntopng gui

Addresses #3699
This commit is contained in:
emanuele-f 2020-05-07 17:46:06 +02:00
parent ebbe0155e3
commit ba5c64b107
28 changed files with 136 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/lua/sprobe_host_process_data.lua
View file

@ -45,21 +45,21 @@ for key, value in pairs(flows_stats) do
if(flow["cli.ip"] == host_ip) then
print('\n\t{"source": "'..flow["client_process"]["pid"]..'", "source_type": "proc", "source_pid": '.. flow["client_process"]["pid"] ..', "source_name": "'..
flow["client_process"]["name"]..'", "target": "'..flow["srv.ip"]..'", "target_type": "host", "target_pid": -1, "target_name": "'
.. host2name(hostkey2hostinfo(flow["srv.ip"])) ..'", "type": "proc2host"}')
.. ip2label(flow["srv.ip"]) ..'", "type": "proc2host"}')
else
print('\n\t{"target": "'..flow["client_process"]["pid"]..'", "target_type": "proc", "target_pid": '.. flow["client_process"]["pid"] ..
', "target_name": "'.. flow["client_process"]["name"].."@".. flow["srv.ip"] ..'", "source": "'..flow["cli.ip"]..
'", "source_type": "host", "source_pid": -1, "source_name": "'.. host2name(hostkey2hostinfo(flow["cli.ip"])) ..'", "type": "host2proc"}')
'", "source_type": "host", "source_pid": -1, "source_name": "'.. ip2label(flow["cli.ip"]) ..'", "type": "host2proc"}')
end
elseif(flow["server_process"] ~= nil) then
if(flow["srv.ip"] == host_ip) then
print('\n\t{"target": "'..flow["server_process"]["pid"]..'", "target_type": "proc", "target_pid": '.. flow["server_process"]["pid"]
..', "target_name": "'.. flow["server_process"]["name"]..'", "source": "'..flow["cli.ip"]..
'", "source_type": "host", "source_pid": -1, "source_name": "'.. host2name(hostkey2hostinfo(flow["cli.ip"])) ..'", "type": "proc2host"}')
'", "source_type": "host", "source_pid": -1, "source_name": "'.. hostkey2hostinfo(flow["cli.ip"]) ..'", "type": "proc2host"}')
else
print('\n\t{"target": "'..flow["server_process"]["pid"]..'", "target_type": "proc", "target_pid": '.. flow["server_process"]["pid"] ..
', "target_name": "'.. flow["server_process"]["name"].."@".. flow["srv.ip"] ..'", "source": "'..flow["cli.ip"]..
'", "source_type": "host", "source_pid": -1, "source_name": "'.. host2name(hostkey2hostinfo(flow["cli.ip"])) ..'", "type": "host2proc"}')
'", "source_type": "host", "source_pid": -1, "source_name": "'.. hostkey2hostinfo(flow["cli.ip"]) ..'", "type": "host2proc"}')
end
end
end