[checkmk-commits] Check_MK Git: check_mk: #1637 FIX Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set

Module: check_mk Branch: master Commit: da016f21194b51df97a0a1bca9df3ffb982c9cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da016f21194b51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 10:35:34 2014 +0100 #1637 FIX Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set --- .werks/1637 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.werks/1637 b/.werks/1637 new file mode 100644 index 0000000..2ea739f --- /dev/null +++ b/.werks/1637 @@ -0,0 +1,9 @@ +Title: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417685701 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d2b8121..caca78c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,6 +163,7 @@ * 1589 FIX: Restructured SNMP credentials rule specification... * 1620 FIX: Fixed exception during host renaming when host has no perfdata * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... + * 1637 FIX: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c9f57d..0193033 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8877,10 +8877,9 @@ def mode_notifications(phase): _("Unknown date") table.cell(_("Date/Time"), date, css="nobr") - nottype = entry.get("NOTIFICATIONTYPE") + nottype = entry.get("NOTIFICATIONTYPE", "") table.cell(_("Type"), nottype) - if nottype in [ "PROBLEM", "RECOVERY" ]: if entry.get("SERVICESTATE"): statename = _(entry["SERVICESTATE"][:4]) @@ -8903,8 +8902,6 @@ def mode_notifications(phase): else: table.cell(_("State"), "") - - table.cell(_("Host"), entry.get("HOSTNAME", "")) table.cell(_("Service"), entry.get("SERVICEDESC", "")) output = entry.get("SERVICEOUTPUT", entry.get("HOSTOUTPUT"))