vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 16:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move extended SNMP location information to separate tab

Browse source 
Fixes #2379
This commit is contained in:
emanuele-f 2019-02-18 16:28:04 +01:00
parent 29c6f1e1b2
commit 35d2e3cf27
3 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/lua/host_details.lua
View file

@ -399,8 +399,9 @@ print [[
]]
local macinfo = interface.getMacInfo(host["mac"])
local has_snmp_location = host['localhost'] and (host["mac"] ~= "")
and (info["version.enterprise_edition"]) and host_has_snmp_location(host["mac"])
--tprint(host)
if((page == "overview") or (page == nil)) then
print("<table class=\"table table-bordered table-striped\">\n")
if(host["ip"] ~= nil) then
@ -424,9 +425,13 @@ if((page == "overview") or (page == nil)) then
print('</td></tr>')
end
if(host['localhost'] and (host["mac"] ~= "") and (info["version.enterprise_edition"])) then
print_host_snmp_localization_table_entry(host["mac"])
local snmp_url = ntop.getHttpPrefix().."/lua/host_details.lua?ifid="..ifId.."&"..hostinfo2url(host_info).."&page=snmp";
if has_snmp_location then
local url = ntop.getHttpPrefix().."/lua/host_details.lua?ifid="..ifId.."&"..hostinfo2url(host_info).."&page=snmp";
print_host_snmp_location(host["mac"], url)
end
print("</tr>")
print("<tr><th>"..i18n("ip_address").."</th><td colspan=1>" .. host["ip"])
@ -1510,10 +1515,12 @@ elseif(page == "snmp" and ntop.isEnterprise()) then
local snmp_devices = get_snmp_devices()
if snmp_devices[host_ip] == nil then -- host has not been configured
local msg = i18n("snmp_page.not_configured_as_snmp_device_message",{host_ip=host_ip})
msg = msg.." "..i18n("snmp_page.guide_snmp_page_message",{url=ntop.getHttpPrefix().."/lua/pro/enterprise/snmpdevices_stats.lua"})
if not has_snmp_location then
local msg = i18n("snmp_page.not_configured_as_snmp_device_message",{host_ip=host_ip})
msg = msg.." "..i18n("snmp_page.guide_snmp_page_message",{url=ntop.getHttpPrefix().."/lua/pro/enterprise/snmpdevices_stats.lua"})
print("<div class='alert alert-info'><i class='fa fa-info-circle fa-lg' aria-hidden='true'></i> "..msg.."</div>")
print("<div class='alert alert-info'><i class='fa fa-info-circle fa-lg' aria-hidden='true'></i> "..msg.."</div>")
end
else
local snmp_device = require "snmp_device"
local snmp_device_ip = snmp_devices[host_ip]["ip"]
@ -1529,6 +1536,12 @@ elseif(page == "snmp" and ntop.isEnterprise()) then
print_snmp_device_system_table(snmp_device.get_device())
end
if has_snmp_location then
print[[<table class="table table-bordered table-striped">]]
print_host_snmp_localization_table_entry(host["mac"])
print[[</table>]]
end
elseif(page == "processes") then
local ebpf_utils = require "ebpf_utils"
ebpf_utils.draw_processes_graph(host_info)