vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix tstamp in select_historical and count_by_24h_historical

Browse source
This commit is contained in:
Alfredo Cardigliano 2021-11-05 12:42:57 +01:00
parent 79cc46ea47
commit 643fdeec68
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/lua/modules/alert_store/alert_store.lua
View file

@ -676,8 +676,14 @@ function alert_store:select_historical(filter, fields)
-- Prepare the final query
-- NOTE: entity_id is necessary as alert_utils.formatAlertMessage assumes it to always be present inside the alert
local q = string.format(" SELECT %u entity_id, (tstamp_end - tstamp) duration, %s FROM `%s` WHERE %s %s %s %s %s",
local q
if ntop.isClickHouseEnabled() then
q = string.format(" SELECT %u entity_id, (toUnixTimestamp(tstamp_end) - toUnixTimestamp(tstamp)) duration, %s FROM `%s` WHERE %s %s %s %s %s",
self._alert_entity.entity_id, fields, self._table_name, where_clause, group_by_clause, order_by_clause, limit_clause, offset_clause)
else
q = string.format(" SELECT %u entity_id, (tstamp_end - tstamp) duration, %s FROM `%s` WHERE %s %s %s %s %s",
self._alert_entity.entity_id, fields, self._table_name, where_clause, group_by_clause, order_by_clause, limit_clause, offset_clause)
end
res = interface.alert_store_query(q)
@ -959,8 +965,14 @@ function alert_store:count_by_24h_historical()
local where_clause = self:build_where_clause()
-- Group by according to the timeslot, that is, the alert timestamp MODULO the slot width
local q = string.format("SELECT (tstamp - tstamp %% %u) as hour, count(*) count FROM %s WHERE %s GROUP BY hour",
time_slot_width, self._table_name, where_clause)
local q
if ntop.isClickHouseEnabled() then
q = string.format("SELECT (toUnixTimestamp(tstamp) - toUnixTimestamp(tstamp) %% %u) as hour, count(*) count FROM %s WHERE %s GROUP BY hour",
time_slot_width, self._table_name, where_clause)
else
q = string.format("SELECT (tstamp - tstamp %% %u) as hour, count(*) count FROM %s WHERE %s GROUP BY hour",
time_slot_width, self._table_name, where_clause)
end
local q_res = interface.alert_store_query(q) or {}