[checkmk-commits] Check_MK Git: check_mk: #2313 FIX notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms

Module: check_mk Branch: master Commit: b0d4290623a3c3c7f29596b44196a4132d4b69d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d4290623a3c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 09:06:02 2015 +0200 #2313 FIX notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms --- .werks/2313 | 9 +++++++++ ChangeLog | 3 +++ modules/notify.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2313 b/.werks/2313 new file mode 100644 index 0000000..39e14ef --- /dev/null +++ b/.werks/2313 @@ -0,0 +1,9 @@ +Title: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i3 +Date: 1435215874 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1bfe85d..ed32676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... + Notifications: + * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms + 1.2.7i2: Core & Setup: diff --git a/modules/notify.py b/modules/notify.py index b937d32..4a4071f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1408,7 +1408,7 @@ def notify_bulk(dirname, uuids): # Per default the uuids are sorted chronologically from oldest to newest # Therefore the notification plugin also shows the oldest entry first # The following configuration option allows to reverse the sorting - if old_params.get("bulk_sort_order") == "newest_first": + if type(old_params) == dict and old_params.get("bulk_sort_order") == "newest_first": bulk_context.reverse() # Converts bulk context from [[1,2],[3,4]] to [1,2,3,4]