[checkmk-commits] 3361 FIX Event Console files not synced to remote site nor backed up with WATO snapshot

Module: check_mk Branch: master Commit: 25060e036285ba9346294d81d57ae2bcb4a16dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25060e036285ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 6 10:15:11 2016 +0200 3361 FIX Event Console files not synced to remote site nor backed up with WATO snapshot --- .werks/3361 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 7 +++++++ web/plugins/wato/mkeventd.py | 6 ------ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/3361 b/.werks/3361 new file mode 100644 index 0000000..e76da4a --- /dev/null +++ b/.werks/3361 @@ -0,0 +1,10 @@ +Title: Event Console files not synced to remote site nor backed up with WATO snapshot +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459930482 + + diff --git a/ChangeLog b/ChangeLog index 24fa9f6..475f31c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 3354 FIX: Added missing option to exclude IP addresses by regex * 3357 FIX: Fixed service conditions of Disk IO related rulesets * 3359 FIX: Fixed exception when trying to edit non existant host... + * 3361 FIX: Event Console files not synced to remote site nor backed up with WATO snapshot Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5b091ff..000b5a3 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -82,6 +82,13 @@ def initialize_before_loading_plugins(): # ( "dir", "autochecks", defaults.autochecksdir ), ] + # Include rule configuration into backup/restore/replication. Current + # status is not backed up. + if config.mkeventd_enabled: + mkeventd_config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" + replication_paths.append(("dir", "mkeventd", mkeventd_config_dir)) + backup_paths.append(("dir", "mkeventd", mkeventd_config_dir)) + global backup_domains backup_domains = {} diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f6cd62d..3773a16 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -35,12 +35,6 @@ mkeventd_config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" if defaults.omd_root: mkeventd_status_file = defaults.omd_root + "/var/mkeventd/status" -# Include rule configuration into backup/restore/replication. Current -# status is not backed up. -if mkeventd_enabled: - replication_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) - backup_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) - #. # .--ValueSpecs----------------------------------------------------------. # | __ __ _ ____ |