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

Improve active monitoring configuration import logic

Browse source 
Existing hosts are now preserved as the logic now relies on the add/edit active monitoring host API.

Addresses #3903
This commit is contained in:
emanuele-f 2020-05-07 15:45:06 +02:00
parent b797f80c42
commit d296210aa6
3 changed files with 60 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

39
scripts/plugins/active_monitoring/web_gui/edit_active_monitoring_host.lua
View file

@ -142,43 +142,8 @@ elseif(action == "edit") then
am_utils.deleteHost(old_am_host, old_measurement) -- also calls discardHostTimeseries
am_utils.addHost(host, measurement, threshold, granularity)
else
-- The key is the same, only update the value/granularity
if(old_granularity ~= granularity) then
-- Need to discard the old timeseries as the granularity has changed
am_utils.discardHostTimeseries(host, measurement)
end
am_utils.addHost(host, measurement, threshold, granularity)
local m_info = am_utils.getMeasurementInfo(measurement)
local last_update = am_utils.getLastAmUpdate(host, measurement)
if m_info and last_update then
-- Recheck the threshold
local key = am_utils.getAmHostKey(host, measurement)
local value = last_update.value
threshold = tonumber(threshold)
-- NOTE: system interface must be manually sected and then unselected
local old_iface = tostring(interface.getId())
interface.select(getSystemInterfaceId())
-- Drop the hour stats if the threshold has changed
if(existing.threshold ~= threshold) then
am_utils.dropHourStats(key)
end
-- Always release the old alert because:
-- - If the granularity has changed, since the alert is bound to a specific granularity, it must be released
-- - If the threshold has changed, we want to change the threshold in the alert message (if engaged)
am_utils.releaseAlert(last_update.ip, key, value, threshold, old_granularity)
if am_utils.hasExceededThreshold(threshold, m_info.operator, value) then
am_utils.triggerAlert(last_update.ip, key, value, threshold, granularity)
end
interface.select(old_iface)
end
-- The key is the same, only update its settings
am_utils.editHost(host, measurement, threshold, granularity)
end
rv.message = i18n("active_monitoring_stats.host_edit_ok", {host=old_url})

13
scripts/plugins/active_monitoring/web_gui/import_active_monitoring_config.lua
View file

@ -9,7 +9,7 @@ require "lua_utils"
local json = require ("dkjson")
local page_utils = require("page_utils")
local plugins_utils = require("plugins_utils")
local active_monitoring_utils = plugins_utils.loadModule("active_monitoring", "am_utils")
local am_utils = plugins_utils.loadModule("active_monitoring", "am_utils")
local json = require ("dkjson")
@ -45,12 +45,17 @@ end
-- ################################################
active_monitoring_utils.resetConfig()
local old_hosts = am_utils.getHosts(true --[[ config only ]])
for host_key, conf in pairs(data) do
host = active_monitoring_utils.key2host(host_key)
-- TODO Validate the configuration
local host = am_utils.key2host(host_key)
active_monitoring_utils.addHost(host.host, host.measurement, conf.threshold, conf.granularity)
if old_hosts[host_key] then
am_utils.editHost(host.host, host.measurement, conf.threshold, conf.granularity)
else
am_utils.addHost(host.host, host.measurement, conf.threshold, conf.granularity)
end
end
-- ################################################