Improve alert time format

ntop · Dec 20, 2018 · 46b950b · 46b950b
1 parent 19052bc
commit 46b950b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/scripts/lua/get_alerts_data.lua b/scripts/lua/get_alerts_data.lua
@@ -9,6 +9,7 @@ require "lua_utils"
 require "alert_utils"
 require "flow_utils"
 
+local format_utils = require "format_utils"
 local json = require "dkjson"
 
 sendHTTPContentTypeHeader('text/html')
@@ -88,8 +89,10 @@ for _key,_value in ipairs(alerts) do
       alert_entity_val = ""
    end
 
-   if(tdiff < 60) then
-      column_date  = secondsToTime(tdiff).." ago"
+   if(tdiff <= 600) then
+      column_date  = secondsToTime(tdiff).. " " ..i18n("details.ago")
+   else
+      column_date = format_utils.formatPastEpochShort(_value["alert_tstamp"])
    end
 
    if engaged == true then

diff --git a/scripts/lua/modules/format_utils.lua b/scripts/lua/modules/format_utils.lua
@@ -218,4 +218,8 @@ function format_utils.formatEpochShort(epoch_begin, epoch_end, epoch)
    return format_utils.formatEpoch(epoch)
 end
 
+function format_utils.formatPastEpochShort(epoch)
+   return format_utils.formatEpochShort(epoch, os.time(), epoch)
+end
+
 return format_utils