vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 10:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove mysql leftovers

Browse source
This commit is contained in:
Alfredo Cardigliano 2025-06-17 10:35:39 +02:00
parent 340641f6c4
commit 6e2aa8cb8b
10 changed files with 7 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/lua/modules/delete_data_utils.lua
View file

@ -96,7 +96,7 @@ end
-- ################################################################
local function delete_host_mysql_flows(interface_id, host_info)
local function delete_host_db_flows(interface_id, host_info)
local status = "OK"
local addr = host_info["host"]
local vlan = host_info["vlan"] or 0
@ -119,20 +119,6 @@ local function delete_host_mysql_flows(interface_id, host_info)
q = string.format("ALTER TABLE `flows` DELETE WHERE %s", where_clause)
if not dry_run and q then
interface.execSQLQuery(q)
end
elseif ntop.getPrefs()["is_dump_flows_to_mysql_enabled"] then
if isIPv4(addr) then
q = string.format("DELETE FROM %s WHERE (IP_SRC_ADDR = INET_ATON('%s') OR IP_DST_ADDR = INET_ATON('%s')) AND VLAN_ID = %u and INTERFACE_ID = %d",
"flowsv4", addr, addr, vlan, interface_id)
elseif isIPv6(addr) then
q = string.format("DELETE FROM %s WHERE (IP_SRC_ADDR = '%s' OR IP_DST_ADDR = '%s') AND VLAN_ID = %u AND INTERFACE_ID = %d",
"flowsv6", addr, addr, vlan, interface_id)
end
if not dry_run and q then
interface.execSQLQuery(q)
end
@ -156,10 +142,10 @@ local function _delete_host(interface_id, host_info)
local h_ts = delete_host_timeseries_data(interface_id, host_info)
local h_rk = delete_host_redis_keys(interface_id, host_info)
local h_db = delete_host_mysql_flows(interface_id, host_info)
local h_db = delete_host_db_flows(interface_id, host_info)
interface.select(old_ifname)
return {delete_host_timeseries_data = h_ts, delete_host_redis_keys = h_rk, delete_host_mysql_flows = h_db}
return {delete_host_timeseries_data = h_ts, delete_host_redis_keys = h_rk, delete_host_db_flows = h_db}
end
-- ################################################################
@ -334,11 +320,9 @@ local function delete_interfaces_db_flows(interfaces_list)
local prefs = ntop.getPrefs()
for if_id, if_name in pairs(interfaces_list) do
-- this deletes MySQL
if prefs.is_dump_flows_to_mysql_enabled == true and not dry_run then
db_utils.harverstExpiredMySQLFlows(if_id, os.time() + 86400 --[[ go 1d in the future to make sure everything is deleted --]])
if ntop.isClickHouseEnabled() and not dry_run then
-- TODO: delete flows from clickhouse for if_id
end
-- TODO: add delete for nIndex
end
return {status = status}