[checkmk-commits] Check_MK Git: check_mk: #2431 FIX WATO Snapshots: Fixed broken performancedata backup

Module: check_mk Branch: master Commit: e4090745be5d672cbe98fc4ab2f94defd7cb991e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4090745be5d67… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 25 15:05:46 2015 +0200 #2431 FIX WATO Snapshots: Fixed broken performancedata backup WATO was unable to import snapshots with included performance data. This error was a side effect of werk #2486. --- .werks/2431 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/backup_domains.py | 15 +++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/2431 b/.werks/2431 new file mode 100644 index 0000000..488f547 --- /dev/null +++ b/.werks/2431 @@ -0,0 +1,10 @@ +Title: WATO Snapshots: Fixed broken performancedata backup +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1443186252 +Class: fix + +WATO was unable to import snapshots with included performance data. +This error was a side effect of werk #2486. diff --git a/ChangeLog b/ChangeLog index 65b45c4..4843dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -286,6 +286,7 @@ * 2610 FIX: Fixed host search showing results of not permitted folder * 2611 FIX: Fixed host view permission checks on host related pages... * 2599 FIX: Fix newly introduced fatal bug preventing creation of new hosts in WATO... + * 2431 FIX: WATO Snapshots: Fixed broken performancedata backup... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index b625f1a..a1c9c3a 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -30,17 +30,20 @@ backup_domains = {} backup_perfdata_enabled = True def performancedata_restore(pre_restore = True): global backup_perfdata_enabled - site = default_site() + site = config.default_site() html.live.set_only_sites([site]) if pre_restore: data = html.live.query("GET status\nColumns: process_performance_data") - backup_perfdata_enabled = data[0][0] == 1 - # Return if perfdata is not activated - nothing to do.. - if not backup_perfdata_enabled: - return [] - elif not backup_perfdata_enabled: + if data: + backup_perfdata_enabled = data[0][0] == 1 + else: + backup_perfdata_enabled = None # Core is offline + + # Return if perfdata is not activated - nothing to do.. + if not backup_perfdata_enabled: # False or None return [] + command = pre_restore and "DISABLE_PERFORMANCE_DATA" or "ENABLE_PERFORMANCE_DATA" html.live.command("[%d] %s" % (int(time.time()), command), site) html.live.set_only_sites()