Module: check_mk
Branch: master
Commit: 6856f5fcb4584feb1363ac1f95ac6d9b4ce378a5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6856f5fcb4584f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 10 11:36:44 2014 +0200
#1125 FIX EC actions couldn't get saved when a EC rule had "Send monitoring
notification" set
This lead to the warning<br>
<tt>You are missing the action with the ID @NOTIFY which is still used in some
rules</tt>
---
.werks/1125 | 10 ++++++++++
ChangeLog | 1 +
mkeventd/web/plugins/wato/mkeventd.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1125 b/.werks/1125
new file mode 100644
index 0000000..05e6dc2
--- /dev/null
+++ b/.werks/1125
@@ -0,0 +1,10 @@
+Title: EC actions couldn't get saved when a EC rule had "Send monitoring
notification" set
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.2.5i6
+Date: 1412933594
+Class: fix
+
+This lead to the warning<br>
+<tt>You are missing the action with the ID @NOTIFY which is still used in some
rules</tt>
diff --git a/ChangeLog b/ChangeLog
index b38b8cc..3e77fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,7 @@
* 1399 FIX: Fix left-over tac processes when showing Event Console history...
* 1402 FIX: Fixed cased where counting events did not reach required count...
* 1124 FIX: WATO EC configuration: no longer raises an exception when user has
restricted WATO access...
+ * 1125 FIX: EC actions couldn't get saved when a EC rule had "Send
monitoring notification" set...
HW/SW-Inventory:
* 0643 windows inventory: OS now contains the install date, reg_uninstall now
contains the path...
diff --git a/mkeventd/web/plugins/wato/mkeventd.py
b/mkeventd/web/plugins/wato/mkeventd.py
index 6ea1e41..81304c4 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -88,7 +88,7 @@ class ActionList(ListOf):
rules = load_mkeventd_rules()
for rule in rules:
for action_id in rule.get("actions", []):
- if action_id not in action_ids:
+ if action_id not in action_ids + ["@NOTIFY"]:
raise MKUserError(varprefix, _("You are missing the action with
the ID <b>%s</b>, "
"which is still used in some rules.") % action_id)