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

Merge branch 'dev' of https://github.com/ntop/ntopng into dev

Browse source
This commit is contained in:
emanuele-f 2020-01-30 09:04:44 +01:00
commit 4b5c7ee75a
15 changed files with 206 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/lua/modules/alert_utils.lua
View file

@ -1230,9 +1230,7 @@ function drawAlertTables(has_past_alerts, has_engaged_alerts, has_flow_alerts, h
for k,v in pairs(get_params) do if k ~= "csrf" then url_params[k] = v end end
if not alt_nav_tabs then
if not options.dont_nest_alerts then
print("<br>")
end
print[[
<ul class="nav nav-tabs" role="tablist" id="alert-tabs" style="]] print(ternary(options.dont_nest_alerts, 'display:none', '')) print[[">
<!-- will be populated later with javascript -->
@ -2106,7 +2104,6 @@ function flushAlertsData()
if(verbose) then io.write("[Alerts] Flushing Redis configuration...\n") end
deleteCachePattern("ntopng.prefs.*alert*")
deleteCachePattern("ntopng.alerts.*")
user_scripts.deleteConfigurations()
alerts_api.purgeAlertsPrefs()
for _, key in pairs(get_make_room_keys("*")) do deleteCachePattern(key) end