host search was infix search instead of full match)
Message-ID: <56404f9c.xJpK3LzOPK1kF4ha%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: d70241bd64f2eb0bf6ce19e79bfd9b9f17083702
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d70241bd64f2eb…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Nov 9 08:45:02 2015 +0100
#2757 FIX Events Check: Fixed check finding too many events (host search was infix search
instead of full match)
The "Check event state in event console" check (check_mkevents) was finding too
many events in case
the check was configured to search for hostname and ipaddress of a host. The regular
expression used
for matching was constructed as infix search, not as full match.
---
.werks/2757 | 12 ++++++++++++
ChangeLog | 1 +
mkeventd/lib/check_mkevents.cc | 3 ++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/2757 b/.werks/2757
new file mode 100644
index 0000000..dcacf1c
--- /dev/null
+++ b/.werks/2757
@@ -0,0 +1,12 @@
+Title: Events Check: Fixed check finding too many events (host search was infix search
instead of full match)
+Level: 1
+Component: ec
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1447054989
+
+The "Check event state in event console" check (check_mkevents) was finding too
many events in case
+the check was configured to search for hostname and ipaddress of a host. The regular
expression used
+for matching was constructed as infix search, not as full match.
diff --git a/ChangeLog b/ChangeLog
index 8b952b1..ef83a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,7 @@
Event Console:
* 2733 Visibility of Event Console events more flexible now...
* 2719 FIX: Events Check: Links to EC were broken when using regular expressions as
application...
+ * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix
search instead of full match)...
Livestatus:
* 2743 FIX: Fixed handling of column types in "GET columns"...
diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc
index 67a8b01..d7ac3ec 100644
--- a/mkeventd/lib/check_mkevents.cc
+++ b/mkeventd/lib/check_mkevents.cc
@@ -196,8 +196,9 @@ int main(int argc, char** argv)
string query_message;
query_message += "GET events\nFilter: event_host ";
if (strchr(host, '/')) {
- query_message += "~~ ";
+ query_message += "~~ ^(";
query_message += prepare_hostname_regex(host);
+ query_message += ")$";
}
else {
query_message += "=~ ";