diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
commit | 8fbefa688fc18dd1936158318ec92a108303d2e8 (patch) | |
tree | 5090afbc864526b9d381b365dfc6365c0ffe408d /doc | |
parent | 44609ec259fdd321520111049ace194a0941a157 (diff) | |
parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
download | rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'doc')
-rw-r--r-- | doc/manual.html | 4 | ||||
-rw-r--r-- | doc/rsyslog_conf_actions.html | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/doc/manual.html b/doc/manual.html index 6dc025ef..3ae3754a 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,11 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> +<<<<<<< HEAD <p><b>This documentation is for version 6.1.10 (beta branch) of rsyslog.</b> +======= +<p><b>This documentation is for version 5.8.2 (v5-stable branch) of rsyslog.</b> +>>>>>>> 68a01594000b788e530ee8f716545dafccf85982 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might diff --git a/doc/rsyslog_conf_actions.html b/doc/rsyslog_conf_actions.html index 4f8c4545..2bcb4146 100644 --- a/doc/rsyslog_conf_actions.html +++ b/doc/rsyslog_conf_actions.html @@ -25,7 +25,7 @@ definition. If you do this, the action will be ignored.</p> more precisely a single filter of such a selector line). Each action must be on its own line and the line must start with an ampersand ('&') character and have no filters. An example would be</p> -<p><code><b>*.=crit rger<br> +<p><code><b>*.=crit :omusrmsg:rger<br> & root<br> & /var/log/critmsgs</b></code></p> <p>These three lines send critical messages to the user rger and @@ -34,7 +34,7 @@ actions per selector is</b> convenient and also <b>offers a performance benefit</b>. As the filter needs to be evaluated only once, there is less computation required to process the directive compared to the otherwise-equal config directives below:</p> -<p><code><b>*.=crit rger<br> +<p><code><b>*.=crit :omusrmsg:rger<br> *.=crit root<br> *.=crit /var/log/critmsgs</b></code></p> <p> </p> @@ -213,13 +213,19 @@ sysklogd,"<%PRI%>%TIMESTAMP% %syslogtag%%msg%\""<br> <h3>List of Users</h3> <p>Usually critical messages are also directed to "root'' on that machine. You can specify a list of users that shall get the -message by simply writing the login. You may specify more than one user -by separating them with commas (",''). If they're logged in they get -the message. Don't think a mail would be sent, that might be too late.</p> +message by simply writing ":omusrmsg: followed by the login name. For example, +the send messages to root, use ":omusrmsg:root". +You may specify more than one user +by separating them with commas (",''). Do not repeat the ":omusrmsg:" prefix in +this case. For example, to send data to users root and rger, use +":omusrmsg:root,rger" (do not use ":omusrmsg:root,:omusrmsg:rger", this is invalid). +If they're logged in they get +the message.</p> <h3>Everyone logged on</h3> <p>Emergency messages often go to all users currently online to notify them that something strange is happening with the system. To -specify this wall(1)-feature use an asterisk ("*'').</p> +specify this wall(1)-feature use an asterisk as the user message +destination(":omusrmsg:*'').</p> <h3>Call Plugin</h3> <p>This is a generic way to call an output plugin. The plugin must support this functionality. Actual parameters depend on the @@ -333,7 +339,7 @@ what you can do with it, see "TEMPLATES" at the top of this document.</p> [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> <p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> project.<br> -Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and +Copyright © 2008-2011 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 2 or higher.</font></p> </body> |