summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--doc/omruleset.html32
-rw-r--r--doc/rsyslog_conf_modules.html2
-rw-r--r--doc/status.html8
4 files changed, 40 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ebaa79b5..4d90c039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ Version 5.3.4 [DEVEL] (rgerhards), 2009-10-??
(in cases where multiple inputs now can avoid lock contention)
- bugfix: correct default for escape ('#') character restored
This was accidently changed to '\\', thanks to David Lang for reporting
-- bugfix(testbench): testcase did not properly wait for rsyslod shutdown
+- bugfix(testbench): testcase did not properly wait for rsyslogd shutdown
thus some unpredictable behavior and a false negative test result
could occur.
---------------------------------------------------------------------------
diff --git a/doc/omruleset.html b/doc/omruleset.html
index 95b0f5b5..41d6ccfc 100644
--- a/doc/omruleset.html
+++ b/doc/omruleset.html
@@ -88,7 +88,39 @@ $ActionOmrulesetRulesetName CommonAction
# of course, we can have "regular" actions alongside :omrulset: actions
*.* /path/to/general-message-file.log
+</textarea>
+<p>The next example is used to creat a high-performance nested and filter condition. Here,
+it is first checked if the message contains a string &quot;error&quot;. If so, the message is forwarded
+to another ruleset which then applies some filters. The advantage of this is that we can use
+high-performance filters where we otherwise would need to use the (much slower) expression-based
+filters. Also, this enables pipeline processing, in that second ruleset is executed in
+parallel to the first one.</p>
+<textarea rows="30" cols="80">$ModLoad omruleset
+# define "second" ruleset
+$RuleSet nested
+$RulesetCreateMainQueue on # again, we use our own queue
+mail.* /path/to/mailerr.log
+kernel.* /path/to/kernelerr.log
+auth.* /path/to/autherr.log
+
+#switch back to default ruleset
+$ruleset RSYSLOG_DefaultRuleset
+
+# begin first action - here we filter on "error"
+# note that we must first specify which ruleset to use for omruleset:
+$ActionOmrulesetRulesetName nested
+:msg, contains, "error :omruleset:
+#end first action
+
+# begin second action - as an example we can do anything else in
+# this processing. Note that these actions are processed concurrently
+# to the ruleset "nested"
+:FROMHOST, isequal, "myhost.example.com" /path/to/host.log
+#end second action
+
+# of course, we can have "regular" actions alongside :omrulset: actions
+*.* /path/to/general-message-file.log
</textarea>
<p><b>Caveats/Known Bugs:</b>
<p>The current configuration file language is not really adequate for a complex construct
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html
index 8ec9b84d..a4c8c423 100644
--- a/doc/rsyslog_conf_modules.html
+++ b/doc/rsyslog_conf_modules.html
@@ -11,7 +11,7 @@ what they do (list is currently not complete)</p>
<li><a href="omsnmp.html">omsnmp</a> - SNMP trap output module</li>
<li><a href="omstdout.html">omtdout</a> - stdout output module (mainly a test tool)</li>
<li><a href="omrelp.html">omrelp</a> - RELP output module</li>
-<li><a href="omrelp.html">omruleset</a> - forward message to another ruleset</li>
+<li><a href="omruleset.html">omruleset</a> - forward message to another ruleset</li>
<li>omgssapi - output module for GSS-enabled syslog</li>
<li><a href="ommysql.html">ommysql</a> - output module for MySQL</li>
<li>ompgsql - output module for PostgreSQL</li>
diff --git a/doc/status.html b/doc/status.html
index 98345962..0a2b9a0d 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -2,7 +2,7 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2009-10-27.</p>
+<p>This page reflects the status as of 2009-11-02.</p>
<h2>Current Releases</h2>
<p><b>v5 development:</b> 5.3.3 [2009-10-27] -
@@ -23,7 +23,11 @@
<a href="http://www.rsyslog.com/Article416.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-182.phtml">download</a></p>
-<p><b>v4 stable:</b> 4.4.2 [2009-10-09] -
+<p><b>v5 stable:</b> 5.2.0 [2009-11-02] -
+<a href="http://www.rsyslog.com/Article421.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-184.phtml">download</a>
+
+<br><b>v4 stable:</b> 4.4.2 [2009-10-09] -
<a href="http://www.rsyslog.com/Article409.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-179.phtml">download</a>