Module: check_mk
Branch: master
Commit: c8d39a2f795e00a452714ddc68307e9245324842
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8d39a2f795e00…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 12 12:08:21 2013 +0100
FIX: Fixed exception when logging actions exectuted by mkeventd
---
ChangeLog | 3 +++
mkeventd/bin/mkeventd | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 084289d..fb04c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
BI:
* FIX: fix exception in BI-Boxes views of host groups
+ Event Console:
+ * FIX: Fixed exception when logging actions exectuted by mkeventd
+
1.2.2b1:
Core:
* cmk --notify: added notification script to generate HTML mails including
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 5ba25a1..1d165ea 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -2296,7 +2296,7 @@ def do_rule_action(action, event, user=""):
log_event_history(event, "EMAIL", user, "%s|%s" % (to,
subject))
elif action_type == 'script':
execute_script(substitute_event_tags(settings["script"], event))
- log_event_history(event, "SCRIPT", user, action)
+ log_event_history(event, "SCRIPT", user, action['id'])
else:
log("Cannot execute action %s: invalid action type %s" %
(action["id"], action_type))
except Exception, e: