diff --git a/scripts/lua/modules/alert_store/alert_store.lua b/scripts/lua/modules/alert_store/alert_store.lua index 43762ee6d1..7685320428 100644 --- a/scripts/lua/modules/alert_store/alert_store.lua +++ b/scripts/lua/modules/alert_store/alert_store.lua @@ -751,7 +751,7 @@ local BASE_RNAME = { SEVERITY = { name = "severity", export = true}, DURATION = { name = "duration", export = true}, COUNT = { name = "count", export = true}, - SCRIPT_KEY = { name = "script_key", export = true}, + SCRIPT_KEY = { name = "script_key", export = false}, } --@brief Convert an alert coming from the DB (value) to a record returned by the REST API diff --git a/scripts/lua/modules/alert_store/user_alert_store.lua b/scripts/lua/modules/alert_store/user_alert_store.lua index a484f62167..91a763ece6 100644 --- a/scripts/lua/modules/alert_store/user_alert_store.lua +++ b/scripts/lua/modules/alert_store/user_alert_store.lua @@ -59,6 +59,17 @@ end -- ############################################## +local RNAME = { + ALERT_NAME = { name = "alert_name", export = true}, + MSG = { name = "msg", export = true, elements = {"name", "value", "description"}} +} + +function user_alert_store:get_rnames() + return RNAME +end + +-- ############################################## + --@brief Convert an alert coming from the DB (value) to a record returned by the REST API function user_alert_store:format_record(value, no_html) local record = self:format_json_record_common(value, alert_entities.user.entity_id, no_html) @@ -67,13 +78,13 @@ function user_alert_store:format_record(value, no_html) local alert_name = alert_consts.alertTypeLabel(tonumber(value["alert_id"]), no_html, alert_entities.user.entity_id) local msg = alert_utils.formatAlertMessage(ifid, value, alert_info) - record["alert_name"] = alert_name + record[RNAME.ALERT_NAME.name] = alert_name if string.lower(noHtml(msg)) == string.lower(noHtml(alert_name)) then msg = "" end - record["msg"] = { + record[RNAME.MSG.name] = { name = noHtml(alert_name), value = tonumber(value["alert_id"]), description = msg, diff --git a/scripts/lua/rest/v1/get/host/alert/list.lua b/scripts/lua/rest/v1/get/host/alert/list.lua index d1b8b0078f..0328388c6c 100644 --- a/scripts/lua/rest/v1/get/host/alert/list.lua +++ b/scripts/lua/rest/v1/get/host/alert/list.lua @@ -45,7 +45,7 @@ for _, _value in ipairs(alerts or {}) do end if no_html then - res = host_alert_store:to_csv(res) + res = host_alert_store:to_csv(res) rest_utils.vanilla_payload_response(rc, res, "text/csv") else rest_utils.extended_answer(rc, {records = res}, { diff --git a/scripts/lua/rest/v1/get/user/alert/list.lua b/scripts/lua/rest/v1/get/user/alert/list.lua index 8c292519b1..59f10ff6fd 100644 --- a/scripts/lua/rest/v1/get/user/alert/list.lua +++ b/scripts/lua/rest/v1/get/user/alert/list.lua @@ -38,8 +38,13 @@ for _key,_value in ipairs(alerts or {}) do res[#res + 1] = record end -- for -rest_utils.extended_answer(rc, {records = res}, { - ["draw"] = tonumber(_GET["draw"]), - ["recordsFiltered"] = recordsFiltered, - ["recordsTotal"] = #res -}, format) +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) +end