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

Fixes total records number on alerts page

Browse source
This commit is contained in:
Matteo Biscosi 2023-05-12 08:19:49 +00:00
parent d4194aecab
commit 0b5103bc5a
7 changed files with 223 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

67
scripts/lua/rest/v2/get/interface/alert/list.lua
View file

@ -1,14 +1,13 @@
--
-- (C) 2021-21 - ntop.org
--
local dirs = ntop.getDirs()
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
package.path = dirs.installdir .. "/scripts/lua/modules/alert_store/?.lua;" .. package.path
local auth = require "auth"
local rest_utils = require("rest_utils")
local interface_alert_store = require "interface_alert_store".new()
local interface_alert_store = require"interface_alert_store".new()
--
-- Read alerts data
@ -23,53 +22,53 @@ local res = {}
local ifid = _GET["ifid"]
local format = _GET["format"] or "json"
local no_html = (format == "txt")
local download = false
local download = false
if ntop.isClickHouseEnabled() and no_html then
download = true
download = true
end
if not auth.has_capability(auth.capabilities.alerts) then
rest_utils.answer(rest_utils.consts.err.not_granted)
return
rest_utils.answer(rest_utils.consts.err.not_granted)
return
end
if isEmptyString(ifid) then
rc = rest_utils.consts.err.invalid_interface
rest_utils.answer(rc)
return
rc = rest_utils.consts.err.invalid_interface
rest_utils.answer(rc)
return
end
interface.select(ifid)
if not download then
local alerts, recordsFiltered, info = interface_alert_store:select_request(nil, "*")
local alerts, recordsFiltered, info = interface_alert_store:select_request(nil, "*")
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = interface_alert_store:format_record(_value, no_html)
end
if no_html then
res = interface_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
end
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = interface_alert_store:format_record(_value, no_html)
end
if no_html then
res = interface_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
local data = {
records = res,
stats = info
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = recordsFiltered
}, format)
end
else
local extra_headers = {}
local rsp = "" -- data pushed by the query function clickhouse_utils.query (clickhouse_utils.lua)
local extra_headers = {}
local rsp = "" -- data pushed by the query function clickhouse_utils.query (clickhouse_utils.lua)
extra_headers["Content-Disposition"] = "attachment;filename=\"interface_alerts_export_"..os.time()..".csv\""
rest_utils.vanilla_payload_response(rest_utils.consts.success.ok, rsp, "application/octet-stream", extra_headers)
interface_alert_store:select_request(nil, "*", download)
extra_headers["Content-Disposition"] = "attachment;filename=\"interface_alerts_export_" .. os.time() .. ".csv\""
rest_utils.vanilla_payload_response(rest_utils.consts.success.ok, rsp, "application/octet-stream", extra_headers)
interface_alert_store:select_request(nil, "*", download)
end