Module: check_mk
Branch: master
Commit: c852712de83e0a902268ab235d1ec924ae6121cd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c852712de83e0a…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Sep 25 09:05:27 2015 +0200
#1295 RBN Rules can now also match service event type OK to OK
Whit this change it's possible that the rules can match e.g. to Custom Notifications.
---
.werks/1295 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 ++
3 files changed, 13 insertions(+)
diff --git a/.werks/1295 b/.werks/1295
new file mode 100644
index 0000000..6a4c937
--- /dev/null
+++ b/.werks/1295
@@ -0,0 +1,10 @@
+Title: RBN Rules can now also match service event type OK to OK
+Level: 1
+Component: notifications
+Compatible: compat
+Version: 1.2.7i3
+Date: 1443164531
+Class: feature
+
+Whit this change it's possible that the rules can match e.g. to Custom
Notifications.
+
diff --git a/ChangeLog b/ChangeLog
index 2b64bf9..9bbc6df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -287,6 +287,7 @@
Notifications:
* 2478 Integrated notification plugin for mobile phone push messages via Pushover...
+ * 1295 RBN Rules can now also match service event type OK to OK...
* 2313 FIX: notification bulking: fixed exception for plugins which are not
configured with checkboxes, e.g. sms
* 2347 FIX: Improved error message in notify.log when sendmail is missing
* 2348 FIX: HTML-Mails: Added missing link to service descriptions
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 69edc2d..48eb009 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9036,6 +9036,8 @@ def event_rule_match_conditions(flavour):
"types then this rule will never hold for host
notifications!"),
choices = [
( 'rw', _("OK") + u" ➤ " +
_("WARN")),
+ ( 'rr', _("OK") + u" ➤ " +
_("OK")),
+
( 'rc', _("OK") + u" ➤ " +
_("CRIT")),
( 'ru', _("OK") + u" ➤ " +
_("UNKNOWN")),