Module: check_mk
Branch: master
Commit: a29c3ed22a15fb60482c40eeac278a873df490c2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a29c3ed22a15fb…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 19 12:17:41 2012 +0200
New global option for enabling log entries for rule hits (debugging)
---
ChangeLog | 1 +
mkeventd/bin/mkeventd | 3 +++
mkeventd/web/plugins/wato/mkeventd.py | 12 ++++++++++++
3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce284ac..d4ffe57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* When saving a rule then its hits counter is always reset
* New feature of hiding certain actions from the commands in the status GUI
* FIX: rule simulator ("Try out") now handles cancelling rules correctly
+ * New global option for enabling log entries for rule hits (debugging)
Multisite:
* Enable automation login with _username= and _secret=, while
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index de491f5..9a63bfb 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -845,6 +845,8 @@ class EventServer:
log(" matching groups: %s" % ", ".join(groups))
g_event_status.count_rule_match(rule["id"])
+ if g_config["log_rulehits"]:
+ log("Rule %s hit by message '%s'." % (event["text"], rule["id"]))
if rule.get("drop"):
self.count("drops")
return
@@ -1862,6 +1864,7 @@ def load_configuration():
"rules" : [],
"actions" : [],
"debug_rules" : False,
+ "log_rulehits" : False,
"retention_interval" : 60,
"housekeeping_interval" : 60,
"statistics_interval" : 5,
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 073f1a9..1ec46b2 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1183,6 +1183,18 @@ if mkeventd_enabled:
domain = "mkeventd")
register_configvar(group,
+ "log_rulehits",
+ Checkbox(title = _("Log rule hits"),
+ label = _("Log hits for rules in log of mkeventd"),
+ help = _("If you enable this option then every time an event matches a rule "
+ "(by normal hit, cancelling, counting or dropping) a log entry will be written "
+ "into the log file of the mkeventd. Please be aware that this might lead to "
+ "a large number of log entries. "),
+ default_value = False),
+ domain = "mkeventd")
+
+
+ register_configvar(group,
"debug_mkeventd_queries",
Checkbox(title = _("Debug queries to mkeventd"),
label = _("enable debugging of queries"),
Module: check_mk
Branch: master
Commit: e5dd30c715688eee37890e3e33cc0672a5f66c8b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5dd30c715688e…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Oct 18 10:48:11 2012 +0200
Updated bug entries #0790
---
.bugs/790 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.bugs/790 b/.bugs/790
index 5e8b21f..2e1b710 100644
--- a/.bugs/790
+++ b/.bugs/790
@@ -1,9 +1,9 @@
Title: Three Livecheck issues
Component: livecheck
-State: open
+Class: bug
+State: done
Date: 2012-10-09 14:20:28
Targetversion: 1.2.0
-Class: bug
1. In livecheck.c:53, int bytes_read = read(fd[0], output, sizeof(output));
does not guarantee a valid 0-byte terminated string. I propose a single
@@ -20,3 +20,9 @@ escaped, there is a nagios function for this called escape_newlines. This
is necessary for long plugin output to be functional.
Ticket #442
+
+2012-10-18 10:48:07: changed state open -> done
+ livecheck:
+ FIX: fixed problem with long plugin output
+ FIX: added /0 termination to strings
+ FIX: changed check_type to be always active (0)