Module: check_mk
Branch: master
Commit: 4ebb726c85a2eee8578c4df9ade3bd4296624f2e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ebb726c85a2ee…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Sep 25 11:18:57 2015 +0200
#2643 FIX Fix spurious CRIT status on check on mknotifyd
In case the total run time of the Linux agent was more than 10 seconds,
the check would go CRIT from time to time and say that the notification
spooler might be crashed. This was due to a to rigid timeout. This
as been fixed.
---
.werks/2643 | 12 ++++++++++++
ChangeLog | 1 +
checks/mknotifyd | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/2643 b/.werks/2643
new file mode 100644
index 0000000..493f3d0
--- /dev/null
+++ b/.werks/2643
@@ -0,0 +1,12 @@
+Title: Fix spurious CRIT status on check on mknotifyd
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.7i3
+Date: 1443172664
+Class: fix
+
+In case the total run time of the Linux agent was more than 10 seconds,
+the check would go CRIT from time to time and say that the notification
+spooler might be crashed. This was due to a to rigid timeout. This
+as been fixed.
diff --git a/ChangeLog b/ChangeLog
index 9bbc6df..4cb1b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* 2543 FIX: Fixed usage of icons/actions configured directly with process rules
* 2630 FIX: fixed incorrect check interval of Check_MK Discovery...
* 2430 FIX: Fixed crash with availability queries when using nagios as core...
+ * 2643 FIX: Fix spurious CRIT status on check on mknotifyd...
Checks & Agents:
* 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes...
diff --git a/checks/mknotifyd b/checks/mknotifyd
index 6292b5d..5310ae5 100644
--- a/checks/mknotifyd
+++ b/checks/mknotifyd
@@ -139,7 +139,7 @@ def check_mknotifyd(item, _no_params, parsed):
# Check age of status file. It's updated every 20 seconds
status_age = now - stat["Updated"]
- if status_age > 30:
+ if status_age > 90:
yield 2, "Status last updated %s ago, spooler seems crashed or busy" % get_age_human_readable(status_age)
else:
yield 0, "Spooler running"
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")),
Module: check_mk
Branch: master
Commit: 4c98213cc1568307c9e46b08f7fce50d5cbb89c6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c98213cc15683…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Sep 24 17:05:48 2015 +0200
Updated bug entries #0854
---
.bugs/854 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.bugs/854 b/.bugs/854
new file mode 100644
index 0000000..1aa5f8a
--- /dev/null
+++ b/.bugs/854
@@ -0,0 +1,9 @@
+Title: mknotifyd.connection: Change behavior in case of no information of spooler
+Component: checks
+State: open
+Date: 2015-09-24 17:03:18
+Targetversion: 1.2.7
+Class: nastiness
+
+Currently the checks goes unknown in case missing information for spooler.
+There should maybe be Crit, because this happens in the case that mknotifd currently don't have connection to a spooler.