From 93c2ce2b6bdbfa5c6e25eca8a35ceaf803a34507 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Fri, 27 Mar 2020 14:45:05 +0100 Subject: [PATCH] Fix errors in RTT hosts import/reset --- scripts/lua/modules/rtt_utils.lua | 6 +++--- scripts/plugins/rtt/web_gui/import_rtt_config.lua | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/lua/modules/rtt_utils.lua b/scripts/lua/modules/rtt_utils.lua index 117e04a666..804fc8dce2 100644 --- a/scripts/lua/modules/rtt_utils.lua +++ b/scripts/lua/modules/rtt_utils.lua @@ -130,10 +130,10 @@ end -- ############################################## function rtt_utils.resetConfig() - local hosts = rtt_utils.getHosts(true --[[ config only]]) + local hosts = rtt_utils.getHosts() - for k in pairs(hosts) do - rtt_utils.deleteHost(k) + for k,v in pairs(hosts) do + rtt_utils.deleteHost(v.host, v.measurement) end ntop.delCache(rtt_hosts_key) diff --git a/scripts/plugins/rtt/web_gui/import_rtt_config.lua b/scripts/plugins/rtt/web_gui/import_rtt_config.lua index 94d000e3e7..a64b605016 100644 --- a/scripts/plugins/rtt/web_gui/import_rtt_config.lua +++ b/scripts/plugins/rtt/web_gui/import_rtt_config.lua @@ -46,8 +46,10 @@ end rtt_utils.resetConfig() -for host, conf in pairs(data) do - rtt_utils.addHost(host, conf.max_rtt or 500) +for host_key, conf in pairs(data) do + host = rtt_utils.key2host(host_key) + + rtt_utils.addHost(host.host, host.measurement, conf.max_rtt or 500) end -- ################################################