Add query stats to alert queries

This commit is contained in:
Alfredo Cardigliano 2021-11-22 11:16:34 +01:00
parent 750bb8c2c0
commit f81a45721b
10 changed files with 91 additions and 35 deletions

View file

@ -38,7 +38,7 @@ end
interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered = all_alert_store:select_request()
local alerts, recordsFiltered, info = all_alert_store:select_request()
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = all_alert_store:format_record(_value, no_html)
@ -48,7 +48,12 @@ if no_html then
res = all_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -31,7 +31,7 @@ end
interface.select(getSystemInterfaceId())
-- Fetch the results
local alerts, recordsFiltered = am_alert_store:select_request()
local alerts, recordsFiltered, info = am_alert_store:select_request()
for _key,_value in ipairs(alerts or {}) do
local record = am_alert_store:format_record(_value, no_html)
@ -42,9 +42,14 @@ if no_html then
res = am_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
end

View file

@ -40,10 +40,10 @@ interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered
if ntop.isClickHouseEnabled() then
alerts, recordsFiltered = flow_alert_store:select_request(nil, "*")
alerts, recordsFiltered, info = flow_alert_store:select_request(nil, "*")
else
-- SQLite need conversion to HEX
alerts, recordsFiltered = flow_alert_store:select_request(nil, "*, hex(alerts_map) alerts_map")
alerts, recordsFiltered, info = flow_alert_store:select_request(nil, "*, hex(alerts_map) alerts_map")
end
for _, _value in ipairs(alerts or {}) do
@ -54,7 +54,12 @@ if no_html then
res = flow_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -38,7 +38,7 @@ end
interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered = host_alert_store:select_request()
local alerts, recordsFiltered, info = host_alert_store:select_request()
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = host_alert_store:format_record(_value, no_html)
@ -48,7 +48,12 @@ if no_html then
res = host_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -38,7 +38,7 @@ end
interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered = interface_alert_store:select_request()
local alerts, recordsFiltered, info = interface_alert_store:select_request()
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = interface_alert_store:format_record(_value, no_html)
@ -48,7 +48,12 @@ if no_html then
res = interface_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -38,7 +38,7 @@ end
interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered = mac_alert_store:select_request()
local alerts, recordsFiltered, info = mac_alert_store:select_request()
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = mac_alert_store:format_record(_value, no_html)
@ -48,7 +48,12 @@ if no_html then
res = mac_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -38,7 +38,7 @@ end
interface.select(ifid)
-- Fetch the results
local alerts, recordsFiltered = network_alert_store:select_request()
local alerts, recordsFiltered, info = network_alert_store:select_request()
for _, _value in ipairs(alerts or {}) do
res[#res + 1] = network_alert_store:format_record(_value, no_html)
@ -48,7 +48,12 @@ if no_html then
res = network_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res

View file

@ -35,7 +35,7 @@ end
interface.select(getSystemInterfaceId())
-- Fetch the results
local alerts, recordsFiltered = system_alert_store:select_request()
local alerts, recordsFiltered, info = system_alert_store:select_request()
for _key,_value in ipairs(alerts or {}) do
local record = system_alert_store:format_record(_value, no_html)
@ -46,9 +46,14 @@ if no_html then
res = system_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
end

View file

@ -31,7 +31,7 @@ end
interface.select(getSystemInterfaceId())
-- Fetch the results
local alerts, recordsFiltered = user_alert_store:select_request()
local alerts, recordsFiltered, info = user_alert_store:select_request()
for _key,_value in ipairs(alerts or {}) do
local record = user_alert_store:format_record(_value, no_html)
@ -42,9 +42,14 @@ if no_html then
res = user_alert_store:to_csv(res)
rest_utils.vanilla_payload_response(rc, res, "text/csv")
else
rest_utils.extended_answer(rc, {records = res}, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
local data = {
records = res,
stats = info,
}
rest_utils.extended_answer(rc, data, {
["draw"] = tonumber(_GET["draw"]),
["recordsFiltered"] = recordsFiltered,
["recordsTotal"] = #res
}, format)
end