AS ranking changes

scripts/lua/modules/alert_consts.lua

@@ -235,18 +235,6 @@ end
 
 -- ##############################################
 
-function alert_consts.formatRanking(ranking)
-    local result = ""
-    for _, table in pairs(ranking) do
-        local ex = getProbeName(table.exporter)
-        if result == "" then result = ex
-        else result = result..",".. ex end
-    end
-    return result
-end
-
--- ##############################################
-
 function getMacUrl(mac)
    if not mac then
       return ""

scripts/lua/modules/alert_definitions/other/alert_as_ranking_changed.lua

@@ -12,7 +12,7 @@ local classes = require "classes"
 local alert = require "alert"
 local mitre = require "mitre_utils"
 local alert_entities = require "alert_entities"
-
+local format_utils = require "format_utils"
 
 -- ##############################################
 
@@ -21,34 +21,52 @@ local alert_as_ranking_changed = classes.class(alert)
 -- ##############################################
 
 alert_as_ranking_changed.meta = {
-    alert_key = other_alert_keys.alert_as_ranking_changed,
-    i18n_title = "alerts_dashboard.as_ranking_changed",
-    icon = "fas fa-exclamation-triangle",
-    entities = {
-        alert_entities.as,
-    }
+   alert_key = other_alert_keys.alert_as_ranking_changed,
+   i18n_title = "alerts_dashboard.as_ranking_changed",
+   icon = "fas fa-exclamation-triangle",
+   entities = {
+      alert_entities.as,
+   }
 
-    -- Mitre Att&ck Matrix values
-    -- mitre_values = {
-    --   mitre_tactic =
-    --   mitre_technique = 
-    --   mitre_id =
-    -- }
+   -- Mitre Att&ck Matrix values
+   -- mitre_values = {
+   --   mitre_tactic =
+   --   mitre_technique =
+   --   mitre_id =
+   -- }
 }
 
 -- ##############################################
 
 -- @brief Prepare an alert table used to generate the alert
 -- @return A table with the alert built
-function alert_as_ranking_changed:init(current_ranking, previous_ranking)
-    self.super:init()
-    self.alert_type_params = {
-        current_ranking = current_ranking,
-        previous_ranking = previous_ranking
-  }
+function alert_as_ranking_changed:init(changes)
+   self.super:init()
+   self.alert_type_params = { changes = changes }
 end
 
--- #######################################################
+-- ##############################################
+
+local function formatRanking(ranking)
+   local result = ""
+
+   for _, t in pairs(ranking) do
+      local ex = getProbeName(t.exporter_ip, false) -- lua_utils_get.lua
+      local ifname = format_portidx_name(t.exporter_ip, t.inteface_id, true)  -- lua_utils_gui.lua
+      local volume = format_utils.bytesToSize(t.value)
+      
+      ex = ex .. ":" .. ifname .. " (".. volume ..")"
+      if result == "" then
+	 result = ex
+      else
+	 result = result..",".. ex
+      end
+   end
+   
+   return result
+end
+
+-- ##############################################
 
 -- @brief Format an alert into a human-readable string
 -- @param ifid The integer interface id of the generated alert
@@ -56,13 +74,15 @@ end
 -- @param alert_type_params Table `alert_type_params` as built in the `:init` method
 -- @return A human-readable string
 function alert_as_ranking_changed.format(ifid, alert, alert_type_params)
-    local alert_consts = require("alert_consts")
-    current = alert_consts.formatRanking(alert_type_params.current_ranking)
-    prev = alert_consts.formatRanking(alert_type_params.previous_ranking)
-    return i18n("alert_messages.alert_as_ranking_changed", {
-        current_ranking = current,
-        previous_ranking = prev
-    })
+   local alert_consts = require("alert_consts")
+
+   current = formatRanking(alert_type_params.changes.current)
+   prev    = formatRanking(alert_type_params.changes.previous)
+
+   return i18n("alert_messages.alert_as_ranking_changed", {
+		  current_ranking = current,
+		  previous_ranking = prev
+   })
 end
 
 -- #######################################################