mirror of
https://github.com/ntop/ntopng.git
synced 2026-04-29 15:39:33 +00:00
Implements telemetry for alter filters
This commit is contained in:
Simone Mainardi
parent
0c0ba319c2
commit
0d39732d1c
8 changed files with 197 additions and 168 deletions
|
|
@ -54,6 +54,7 @@ user_scripts.operator_functions = {
|
|||
|
||||
-- ##############################################
|
||||
|
||||
local NUM_FILTERED_KEY = "ntopng.cache.user_scripts.exclusion_counter.subdir_%s.script_key_%s"
|
||||
local REQUEST_PERIODIC_USER_SCRIPTS_RUN_KEY = "ntopng.cache.ifid_%i.user_scripts.request.granularity_%s"
|
||||
local NON_TRAFFIC_ELEMENT_CONF_KEY = "all"
|
||||
local NON_TRAFFIC_ELEMENT_ENTITY = "no_entity"
|
||||
|
|
@ -554,6 +555,7 @@ local function init_user_script(user_script, mod_fname, full_path, plugin, scrip
|
|||
user_script.script_type = script_type
|
||||
user_script.edition = plugin.edition
|
||||
user_script.category = checkCategory(user_script.category)
|
||||
user_script.num_filtered = tonumber(ntop.getCache(string.format(NUM_FILTERED_KEY, subdir, mod_fname))) or 0 -- math.random(1000,2000)
|
||||
|
||||
if(user_script.gui and user_script.gui.input_builder) then
|
||||
user_script.template = user_scripts_templates[user_script.gui.input_builder]
|
||||
|
|
@ -1422,6 +1424,9 @@ function user_scripts.loadDefaultConfig()
|
|||
local scripts = user_scripts.load(ifid, script_type, subdir, {return_all = true})
|
||||
|
||||
for key, usermod in pairs(scripts.modules) do
|
||||
-- Cleanup exclusion counters
|
||||
ntop.delCache(string.format(NUM_FILTERED_KEY, subdir, key))
|
||||
|
||||
if((usermod.default_enabled ~= nil) or (usermod.default_value ~= nil)) then
|
||||
default_conf[subdir] = default_conf[subdir] or {}
|
||||
default_conf[subdir][key] = default_conf[subdir][key] or {}
|
||||
|
|
@ -1806,6 +1811,9 @@ function user_scripts.matchExcludeFilter(filters_config, script, subdir)
|
|||
if filter_matches then
|
||||
-- There's a match with this filter! let's return
|
||||
if filters_debug then traceError(TRACE_NORMAL, TRACE_CONSOLE, script.key..": filter IS matching") end
|
||||
-- Increase the counter
|
||||
ntop.incrCache(string.format(NUM_FILTERED_KEY, subdir, script.key))
|
||||
-- Return
|
||||
return true
|
||||
else
|
||||
if filters_debug then traceError(TRACE_NORMAL, TRACE_CONSOLE, script.key..": filter NOT matching") end
|
||||
|
|
@ -1899,6 +1907,176 @@ function user_scripts.getDefaultFilters(ifid, subdir, script_key)
|
|||
return filters
|
||||
end
|
||||
|
||||
|
||||
-- ##############################################
|
||||
|
||||
local function printUserScriptsTable()
|
||||
local ifid = interface.getId()
|
||||
|
||||
for _, info in ipairs(user_scripts.listSubdirs()) do
|
||||
|
||||
local scripts = user_scripts.load(ifid, user_scripts.getScriptType(info.id), info.id, {return_all = true})
|
||||
|
||||
for name, script in pairsByKeys(scripts.modules) do
|
||||
|
||||
local available = ""
|
||||
local filters = {}
|
||||
local hooks = {}
|
||||
|
||||
-- Hooks
|
||||
for hook in pairsByKeys(script.hooks) do
|
||||
hooks[#hooks + 1] = hook
|
||||
end
|
||||
hooks = table.concat(hooks, ", ")
|
||||
|
||||
-- Filters
|
||||
if(script.is_alert) then filters[#filters + 1] = "alerts" end
|
||||
if(script.l4_proto) then filters[#filters + 1] = "l4_proto=" .. script.l4_proto end
|
||||
if(script.l7_proto) then filters[#filters + 1] = "l7_proto=" .. script.l7_proto end
|
||||
if(script.packet_interface_only) then filters[#filters + 1] = "packet_interface" end
|
||||
if(script.three_way_handshake_ok) then filters[#filters + 1] = "3wh_completed" end
|
||||
if(script.local_only) then filters[#filters + 1] = "local_only" end
|
||||
if(script.nedge_only) then filters[#filters + 1] = "nedge=true" end
|
||||
if(script.nedge_exclude) then filters[#filters + 1] = "nedge=false" end
|
||||
filters = table.concat(filters, ", ")
|
||||
|
||||
if (name == "my_custom_script") then
|
||||
goto skip
|
||||
end
|
||||
|
||||
-- Availability
|
||||
if(script.edition == "enterprise_m") then
|
||||
available = "Enterprise M"
|
||||
elseif(script.edition == "enterprise_l") then
|
||||
available = "Enterprise L"
|
||||
elseif(script.edition == "pro") then
|
||||
available = "Pro"
|
||||
else
|
||||
available = "Community"
|
||||
end
|
||||
|
||||
local edit_url = user_scripts.getScriptEditorUrl(script)
|
||||
|
||||
if(edit_url) then
|
||||
edit_url = ' <a title="'.. i18n("plugins_overview.action_view") ..'" href="'.. edit_url ..'" class="btn btn-sm btn-secondary" ><i class="fas fa-eye"></i></a>'
|
||||
end
|
||||
|
||||
print(string.format(([[
|
||||
<tr>
|
||||
<td>%s</td>
|
||||
<td>%s</td>
|
||||
<td>%s</td>
|
||||
<td>%s</td>
|
||||
<td>%s</td>
|
||||
<td class="text-right">%u</td>
|
||||
<td class="text-center">%s</td></tr>
|
||||
]]), name, info.label, available, hooks, filters, script.num_filtered, edit_url or ""))
|
||||
::skip::
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- #######################################################
|
||||
|
||||
function user_scripts.printUserScripts()
|
||||
print([[
|
||||
<div class='col-12 my-3'>
|
||||
<table class='table table-bordered table-striped' id='user-scripts'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>]].. i18n("plugins_overview.script") ..[[</th>
|
||||
<th>]].. i18n("plugins_overview.type") ..[[</th>
|
||||
<th>]].. i18n("availability") ..[[</th>
|
||||
<th>]].. i18n("plugins_overview.hooks") ..[[</th>
|
||||
<th>]].. i18n("plugins_overview.filters") ..[[</th>
|
||||
<th>]].. i18n("plugins_overview.filtered") ..[[</th>
|
||||
<th>]].. i18n("action") ..[[</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>]])
|
||||
printUserScriptsTable()
|
||||
print([[
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<link href="]].. ntop.getHttpPrefix() ..[[/datatables/datatables.min.css" rel="stylesheet"/>
|
||||
<script type='text/javascript'>
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
const addFilterDropdown = (title, values, column_index, datatableFilterId, tableApi) => {
|
||||
|
||||
const createEntry = (val, callback) => {
|
||||
const $entry = $(`<li class='dropdown-item pointer'>${val}</li>`);
|
||||
$entry.click(function(e) {
|
||||
|
||||
$dropdownTitle.html(`<i class='fas fa-filter'></i> ${val}`);
|
||||
$menuContainer.find('li').removeClass(`active`);
|
||||
$entry.addClass(`active`);
|
||||
callback(e);
|
||||
});
|
||||
|
||||
return $entry;
|
||||
}
|
||||
|
||||
const dropdownId = `${title}-filter-menu`;
|
||||
const $dropdownContainer = $(`<div id='${dropdownId}' class='dropdown d-inline'></div>`);
|
||||
const $dropdownButton = $(`<button class='btn-link btn dropdown-toggle' data-toggle='dropdown' type='button'></button>`);
|
||||
const $dropdownTitle = $(`<span>${title}</span>`);
|
||||
$dropdownButton.append($dropdownTitle);
|
||||
|
||||
const $menuContainer = $(`<ul class='dropdown-menu' id='${title}-filter'></ul>`);
|
||||
values.forEach((val) => {
|
||||
const $entry = createEntry(val, (e) => {
|
||||
tableApi.columns(column_index).search(val).draw(true);
|
||||
});
|
||||
$menuContainer.append($entry);
|
||||
});
|
||||
|
||||
const $allEntry = createEntry(']].. i18n('all') ..[[', (e) => {
|
||||
$dropdownTitle.html(`${title}`);
|
||||
$menuContainer.find('li').removeClass(`active`);
|
||||
tableApi.columns().search('').draw(true);
|
||||
});
|
||||
$menuContainer.prepend($allEntry);
|
||||
|
||||
$dropdownContainer.append($dropdownButton, $menuContainer);
|
||||
$(datatableFilterId).prepend($dropdownContainer);
|
||||
}
|
||||
|
||||
const $userScriptsTable = $('#user-scripts').DataTable({
|
||||
pagingType: 'full_numbers',
|
||||
initComplete: function(settings) {
|
||||
|
||||
const table = settings.oInstance.api();
|
||||
const types = [... new Set(table.columns(1).data()[0].flat())];
|
||||
const availability = [... new Set(table.columns(2).data()[0].flat())];
|
||||
|
||||
addFilterDropdown(']].. i18n("availability") ..[[', availability, 2, "#user-scripts_filter", table);
|
||||
addFilterDropdown(']].. i18n("plugins_overview.type") ..[[', types, 1, "#user-scripts_filter", table);
|
||||
},
|
||||
pageLength: 25,
|
||||
language: {
|
||||
info: "]].. i18n('showing_x_to_y_rows', {x='_START_', y='_END_', tot='_TOTAL_'}) ..[[",
|
||||
search: "]].. i18n('search') ..[[:",
|
||||
infoFiltered: "",
|
||||
paginate: {
|
||||
previous: '<',
|
||||
next: '>',
|
||||
first: '«',
|
||||
last: '»'
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
]])
|
||||
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
||||
return(user_scripts)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue