diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-13 13:00:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-13 13:00:36 +0200 |
| commit | b00d4b5ad8df833294312843a580352d4f0c1694 (patch) | |
| tree | 34e6b21ea42a4cafbf562508336b0734ad5e2358 | |
| parent | 81b302eb654099a8919458cb3b18168cc7b98ff7 (diff) | |
| parent | d2b045c5021ab713e482255d0796996637851745 (diff) | |
| download | rsyslog-b00d4b5ad8df833294312843a580352d4f0c1694.tar.gz rsyslog-b00d4b5ad8df833294312843a580352d4f0c1694.tar.xz rsyslog-b00d4b5ad8df833294312843a580352d4f0c1694.zip | |
Merge branch 'v5-stable'
| -rw-r--r-- | plugins/pmaixforwardedfrom/pmaixforwardedfrom.c | 2 | ||||
| -rw-r--r-- | tools/rsyslog.conf.5 | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c index fa4a9087..fe3e85fa 100644 --- a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c +++ b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c @@ -1,6 +1,6 @@ /* pmaixforwardedfrom.c * - * this detects logs sent by Cisco devices that mangle their syslog output when you tell them to log by name by adding ' :' between the name and the %XXX-X-XXXXXXX: tag + * this cleans up messages forwarded from AIX * * instead of actually parsing the message, this modifies the message and then falls through to allow a later parser to handle the now modified message * diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index e17da974..6ce3c0e0 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -272,14 +272,16 @@ Please note that rsyslogd offers a variety of options in regarding to remote forwarding. For full details, please see the html documentation. .SS List of users -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. +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 ":omusrmsg:" followed +by the login name. You may specify more than one +user by separating them with commas (','). If they're logged in they +get the message (for example: ":omusrmsg:root,user1,user2"). .SS Everyone logged on 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 ('*'). +is happening with the system. To specify this wall(1)-feature use an ":omusrmsg:*". .SS Database table This allows logging of the message to a database table. @@ -558,10 +560,10 @@ that space. Keep in mind that $outchannel just defines a channel with "name". It does not activate it. To do so, you must use a selector line (see below). That selector line includes the channel -name plus an $ sign in front of it. A sample might be: +name plus ":omfile:$" in front of it. A sample might be: .sp .RS -*.* $mychannel +*.* :omfile:$mychannel .RE .SH PROPERTY REPLACER |