Module: check_mk Branch: master Commit: 32658ebc3b244dbab8c00dec68f7dbb21bfbb72f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32658ebc3b244d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 14 12:08:55 2016 +0200 3821 FIX WATO Network Scan: Fixed risk of loosing site tags when performing a network scan A network scan on a folder could cause the loss of any site tags configured in this folder. As a result, these hosts were monitored multiple times on different sites, when a distributed WATO setup was used. --- .werks/3821 | 14 ++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 17 insertions(+) diff --git a/.werks/3821 b/.werks/3821 new file mode 100644 index 0000000..2509a56 --- /dev/null +++ b/.werks/3821 @@ -0,0 +1,14 @@ +Title: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1476439400 +Class: fix + +A network scan on a folder could cause the loss of any site tags configured in this +folder. As a result, these hosts were monitored multiple times on different sites, +when a distributed WATO setup was used. + +Developer note: This only happened when a "fresh" apache process handled this request. +Any hosttags and site defines were missing.. diff --git a/ChangeLog b/ChangeLog index ebf4add..65ed130 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 3901 Logfile pattern analyser: pattern lists can now be searched * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... + * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5ad73ab..7174435 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15854,6 +15854,8 @@ def read_agent_contents_file(root): # master site. Finds the next folder to scan and starts it via WATO # automation. The result is written to the folder in the master site. def execute_network_scan_job(): + init_wato_datastructures() + if is_wato_slave_site(): return # Don't execute this job on slaves.