Module: check_mk Branch: master Commit: 9bf5505612ce0ab4109cc0ceda6513dd756db821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf5505612ce0a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 24 15:18:16 2015 +0100 #1306 mkeventd: The Recent event history can you be filtered by extended regexes --- .werks/1306 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1306 b/.werks/1306 new file mode 100644 index 0000000..f04f93f --- /dev/null +++ b/.werks/1306 @@ -0,0 +1,9 @@ +Title: mkeventd: The Recent event history can you be filtered by extended regexes +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1448374649 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f6fd98a..fb2d1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,6 +151,7 @@ Event Console: * 2733 Visibility of Event Console events more flexible now... + * 1306 mkeventd: The Recent event history can you be filtered by extended regexes * 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)... * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f25ab57..fc79159 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -847,7 +847,7 @@ def parse_history_file(path, headers, filters, greptexts, limit): # Revert lines from the log file to have the newer lines processed first cmd = 'tac "%s"' % path if greptexts: - cmd += " | grep -i -e %s" % quote_shell_string(".*".join(greptexts)) + cmd += " | egrep -i -e %s" % quote_shell_string(".*".join(greptexts)) grep = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE) for line in grep.stdout: