Module: check_mk
Branch: master
Commit: f69a90b1ea923451dff747d10c75ed64f97d9dad
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f69a90b1ea9234…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 19 11:20:47 2016 +0100
4153 FIX Fix forwarding notifications to Check_MK when no contact groups are set
Change-Id: Ibd12eca0724e7d2883813ec2062678ce19be11da
---
.werks/4153 | 9 +++++++++
ChangeLog | 1 +
bin/mkeventd | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/4153 b/.werks/4153
new file mode 100644
index 0000000..21a0580
--- /dev/null
+++ b/.werks/4153
@@ -0,0 +1,9 @@
+Title: Fix forwarding notifications to Check_MK when no contact groups are set
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.4.0i3
+Date: 1482142829
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index cfe294f..fa553b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -153,6 +153,7 @@
* 4147 FIX: Always show rule analyser result on Generate, not only after previous Try
out...
* 4149 FIX: Fix notifications from Event Console if host has more than one
contact...
* 4152 FIX: Fix matching of hosts when forwarding notifications from Event
Console...
+ * 4153 FIX: Fix forwarding notifications to Check_MK when no contact groups are set
Livestatus:
* 3651 FIX: Fixed potential segfault with Nagios core when accessing log/commands
table via Livestatus....
diff --git a/bin/mkeventd b/bin/mkeventd
index 9b68d71..6462a51 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -4131,7 +4131,7 @@ def base_notification_context(event, username, is_cancelling):
"EC_CONTACT": event.get("contact",
""),
"EC_PID": str(event.get("pid", 0)),
"EC_MATCH_GROUPS":
"\t".join(event["match_groups"]),
- "EC_CONTACT_GROUPS": "
".join(event.get("contact_groups", [])),
+ "EC_CONTACT_GROUPS": "
".join(event.get("contact_groups") or []),
"EC_ORIG_HOST": event.get("orig_host",
event["host"]),
}