[checkmk-commits] Check_MK Git: check_mk: #2474 FIX Fixed possible corruption of user datasets (contact, mail, rbn config)

Module: check_mk Branch: master Commit: cc3b05167dcedb26226c094cd0b2cfda3ecfd5e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc3b05167dcedb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 23 10:13:43 2015 +0200 #2474 FIX Fixed possible corruption of user datasets (contact, mail, rbn config) When moving user notification rules in an installation where a lot of users are working with the GUI, it could happen that the file which stores contact, mail and user rbn configuration (contacts.mk) could corrupt and lead to lost attributes for all the users. --- .werks/2474 | 13 +++++++++++++ ChangeLog | 3 ++- web/htdocs/wato.py | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/2474 b/.werks/2474 new file mode 100644 index 0000000..e8d7e11 --- /dev/null +++ b/.werks/2474 @@ -0,0 +1,13 @@ +Title: Fixed possible corruption of user datasets (contact, mail, rbn config) +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1437639107 + +When moving user notification rules in an installation where a lot of users +are working with the GUI, it could happen that the file which stores contact, +mail and user rbn configuration (contacts.mk) could corrupt and lead to lost +attributes for all the users. diff --git a/ChangeLog b/ChangeLog index f017a01..7f02900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,9 +27,9 @@ * 2286 hp_procurve_cpu, hp_procurve_mem, hp_procurve_sensors: now can monitor HP 2920 Switch Stack... * 2287 New Checks fjdarye500_cadaps fjdarye500_cmods fjdarye500_cmods_flash fjdarye500_cmods_mem fjdarye500_conencs fjdarye500_cpsus fjdarye500_devencs fjdarye500_disks fjdarye500_expanders fjdarye500_inletthmls fjdarye500_sum fjdarye500_syscaps fjdarye500_thmls: Fujitsu Eternus DX500 S3 * 2409 AIX DB2 monitoring: the agent plugin now processes all db2 instances in parallel... - * 2410 ESX / agent_vsphere: Now able to re-use session cookies... * 2288 check_mk_agent.aix: New sections for HACMP cluster manager... * 2289 New checks: aix_hacmp_resources, aix_hacmp_services, aix_hacmp_nodes... + * 2410 ESX / agent_vsphere: Now able to re-use session cookies... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... @@ -116,6 +116,7 @@ * 2466 FIX: Fixed exception when searching for rulesets / global settings using special characters like umlauts * 2467 FIX: Fixed encoding exception occuring in localized GUI when a WATO action triggers an error message... * 2407 FIX: WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site... + * 2474 FIX: Fixed possible corruption of user datasets (contact, mail, rbn config)... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1870068..d5b00b4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9628,7 +9628,7 @@ def mode_user_notifications(phase, profilemode): if phase == "title": return title - users = userdb.load_users(lock = phase == 'action') + users = userdb.load_users(lock = phase == 'action' or html.has_var("_move")) user = users[userid] rules = user.setdefault("notification_rules", [])