[checkmk-commits] Check_MK Git: check_mk: #1839 FIX Fix exception when notifying EC alert into monitoring for traps (because PID is missing)

Module: check_mk Branch: master Commit: 110c4385802fa946118f9ee4e7efcd260153973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=110c4385802fa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 9 13:02:19 2015 +0100 #1839 FIX Fix exception when notifying EC alert into monitoring for traps (because PID is missing) --- .werks/1839 | 10 ++++++++++ ChangeLog | 3 +++ mkeventd/bin/mkeventd | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1839 b/.werks/1839 new file mode 100644 index 0000000..493eb28 --- /dev/null +++ b/.werks/1839 @@ -0,0 +1,10 @@ +Title: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420804907 + + diff --git a/ChangeLog b/ChangeLog index 9f4eae1..e78e400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,9 @@ BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used + Event Console: + * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) + 1.2.6b1: Core & Setup: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 9b81150..39b6564 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3091,7 +3091,7 @@ def do_notify(event, username, is_cancelling): "EC_PHASE": event["phase"], "EC_COMMENT": event.get("comment", ""), "EC_OWNER": event.get("owner", ""), - "EC_PID": str(event["pid"]), + "EC_PID": str(event.get("pid", 0)), "EC_MATCH_GROUPS": "\t".join(event["match_groups"]), "EC_CONTACT_GROUPS": event["contact_groups"] and " ".join(event["contact_groups"]) or "", }