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

Handles netowrk interfaces with integer ids

Browse source 
To prevent possible issues with special characters like /,
interface have been handled in the web UI via integer ids
This commit is contained in:
Simone Mainardi 2016-03-10 17:45:27 +01:00
parent ec572f6084
commit 97c45aef96
6 changed files with 96 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scripts/lua/modules/graph_utils.lua
View file

@ -356,16 +356,16 @@ function drawRRD(ifid, host, rrdFile, zoomLevel, baseurl, show_timeseries,
print[[
<script>
setInterval(function() {
var talkers_loaded, protocols_loaded;
if($('a[href="#historical-top-talkers"]').length){
talkers_loaded = $('a[href="#historical-top-talkers"]').attr("loaded");
}
if($('a[href="#historical-top-apps"]').length){
protocols_loaded = $('a[href="#historical-top-apps"]').attr("loaded");
}
if(typeof talkers_loaded == 'undefined' && typeof protocols_loaded == 'undefined'){
window.location.reload();
}
var talkers_loaded, protocols_loaded;
if($('a[href="#historical-top-talkers"]').length){
talkers_loaded = $('a[href="#historical-top-talkers"]').attr("loaded");
}
if($('a[href="#historical-top-apps"]').length){
protocols_loaded = $('a[href="#historical-top-apps"]').attr("loaded");
}
if(typeof talkers_loaded == 'undefined' && typeof protocols_loaded == 'undefined'){
window.location.reload();
}
}, 60*1000);
</script>]]
end
@ -699,7 +699,7 @@ infoHTML += "<ul>";
$.ajax({
type: 'GET',
url: ']]
print(ntop.getHttpPrefix().."/lua/top_generic.lua?m=top_talkers&epoch='+point.value.x+'&addvlan=true")
print(ntop.getHttpPrefix().."/lua/top_generic.lua?m=top_talkers&epoch='+point.value.x+'&addvlan=true&id="..tostring(ifid))
print [[',
data: { epoch: point.value.x },
async: false,
@ -1028,11 +1028,14 @@ end
if host ~= "" and host ~= nil then
div_data = div_data..' host="'..tostring(host)..'" '
end
if l7proto ~= "" and l7proto ~= nil then
div_data = div_data..' proto_id="'..l7proto..'" '
end
if (not((limitv4 == nil) or (limitv4 == "") or (limitv4 == "0"))) then
print [[
<div class="tab-pane fade" id="ipv4" ]] print(div_data) print[[">
<div id="table-flows4"></div>
<div id="table-flows4"></div>
]] historicalDownloadButtonsBar('flows_v4', 'ipv4') print[[
</div>
]]