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

Remove duplicate RTT host configuration

Browse source
This commit is contained in:
emanuele-f 2019-09-30 12:19:05 +02:00
parent 46c47b7d45
commit 84cff5bacc
2 changed files with 0 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

90
scripts/lua/modules/rtt_utils.lua
View file

@ -137,94 +137,4 @@ end
-- ##############################################
local function get_rtt_host_table_data(host_key)
local host_conf = rtt_utils.getHost(host_key)
if not host_conf then
return
end
local host_rtt = rtt_utils.getLastRttUpdate(host_key)
local host_chart = ''
if ts_utils.exists("monitored_host:rtt", {ifid = getSystemInterfaceId(), host = host_key}) then
host_chart = '<a href="'.. ntop.getHttpPrefix() ..'/lua/system/rtt_stats.lua?rtt_host='.. host_key ..'&page=historical"><i class="fa fa-area-chart fa-lg"></i></a>'
end
return {conf = host_conf, rtt = host_rtt, chart = host_chart}
end
-- ##############################################
local function print_host_rtt_table_row(host, i18n_host_label, host_value, host_data)
print[[
<tr>
<th width=10%>]] print(i18n(i18n_host_label)) print[[</th>
<td width=20%>]] print(host_value) print[[</td>]]
if not host_data then
print[[<td colspan=4><i>]] print(i18n("system_stats.no_rtt_configured_for_host", {host = host_value})) print[[.</i>]]
print[[ <a href="]] print(ntop.getHttpPrefix()) print[[/lua/host_details.lua?]] print(hostinfo2url(host)) print[[&page=config"><i class="fa fa-cog"></i></a>]]
print[[</td>]]
else
local last_val = ''
local last_update = ''
if host_data["rtt"] then
last_val = format_utils.formatValue(host_data["rtt"]["value"]).." ms"
last_update = format_utils.formatPastEpochShort(host_data["rtt"]["when"])
end
print[[
<td style="text-align: center;">]] print(host_data["chart"]) print[[</td>
<td style="text-align: center;">]] print(formatValue(host_data["conf"]["max_rtt"])) print[[ ms</td>
<td style="text-align: center;">]] print(last_val) print[[</td>
<td style="text-align: center;">]] print(last_update) print[[</td>
</tr>]]
end
end
-- ##############################################
function rtt_utils.print_host_rtt_table(host)
local host_ip = host["ip"]
local host_ip_key = rtt_utils.host2key(host_ip, ternary(isIPv4(host_ip), "ipv4", "ipv6"), "icmp")
local host_ip_data = get_rtt_host_table_data(host_ip_key)
local host_name = getResolvedAddress(hostkey2hostinfo(host["ip"]))
local host_name_key
local host_name_data
if host_name ~= host_ip then
host_name_key = rtt_utils.host2key(host_name, ternary(isIPv4(host_ip), "ipv4", "ipv6"), "icmp")
host_name_data = get_rtt_host_table_data(host_name_key)
end
print[[
<table class="table table-bordered table-striped">
<thead>
<tr>
<th width=10% colspan=2>]] print(i18n("traffic_profiles.host_traffic")) print[[</th>
<th style="text-align: center;" width=5%>]] print(i18n("chart")) print[[</th>
<th style="text-align: center;">]] print(i18n("system_stats.max_rtt_no_ms")) print[[</th>
<th style="text-align: center;">]] print(i18n("system_stats.last_rtt")) print[[</th>
<th style="text-align: center;">]] print(i18n("category_lists.last_update")) print[[</th>
</tr>
</thead>
<tbody>]]
print_host_rtt_table_row(host, "ip_address", host_ip, host_ip_data)
if host_name ~= host_ip and host_name_data
and ((host_name_data["conf"]["iptype"] == "ipv4" and isIPv4(host_ip))
or (host_name_data["conf"]["iptype"] == "ipv6" and isIPv6(host_ip))) then
print_host_rtt_table_row(host, "name", host_name, host_name_data)
end
print[[
</tbody>
</table>
]]
end
-- ##############################################
return rtt_utils