Moved Disaggregation Criterion setting to the interface (per interface now)

This commit is contained in:
Alfredo Cardigliano 2019-09-25 12:19:22 +02:00
parent dbe48cebc5
commit ff36d16968
7 changed files with 67 additions and 40 deletions

View file

@ -226,36 +226,6 @@ local subpage_active, tab = prefsGetActiveSubpage(show_advanced_prefs, _GET["tab
function printInterfaces()
print('<form method="post">')
print('<table class="table">')
print('<tr><th colspan=2 class="info">'..i18n("prefs.dynamic_network_interfaces")..'</th></tr>')
local labels = {i18n("prefs.none"),
i18n("prefs.vlan"),
i18n("prefs.probe_ip_address"),
i18n("prefs.flow_interface"),
i18n("prefs.ingress_flow_interface"),
i18n("prefs.ingress_vrf_id")}
local values = {"none",
"vlan",
"probe_ip",
"iface_idx",
"ingress_iface_idx",
"ingress_vrf_id"}
local elementToSwitch = {}
local showElementArray = { true, false, false }
local javascriptAfterSwitch = "";
local cur_mode_key = "ntopng.prefs.dynamic_flow_collection_mode"
local cur_mode = ntop.getPref(cur_mode_key)
prefsDropdownFieldPrefs(subpage_active.entries["dynamic_interfaces_creation"].title,
subpage_active.entries["dynamic_interfaces_creation"].description.."<p><b>"..i18n("notes").."</b><ul>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_0").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_1").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_2").."</li>"..
"<li>"..i18n("prefs.dynamic_interfaces_creation_note_3").."</li></ul>",
"disaggregation_criterion", labels,
ternary(not isEmptyString(cur_mode), cur_mode, "none"), true,
{keys=values, save_pref=true, pref_key=cur_mode_key})
print('<tr><th colspan=2 class="info">'..i18n("prefs.zmq_interfaces")..'</th></tr>')