diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
| commit | 12102199c4b3a042fb91e1d52eb274f06e62213e (patch) | |
| tree | 6e8d19a7a004bcc3fb03c2290a630281a846ff86 /doc | |
| parent | e61672c6932868d6b09ad0ae8453dc91c545742f (diff) | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| download | rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.gz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.xz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/property_replacer.html | 4 | ||||
| -rw-r--r-- | doc/rsyslog_recording_pri.html | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/property_replacer.html b/doc/property_replacer.html index cd357f67..f0153f2a 100644 --- a/doc/property_replacer.html +++ b/doc/property_replacer.html @@ -65,8 +65,8 @@ BSD syslogd. For example, when TAG is "named[12345]", programname is </tr> <tr> <td><b>pri-text</b></td> -<td>the PRI part of the message in a textual form (e.g. -"syslog.info")</td> +<td>the PRI part of the message in a textual form with the numerical PRI appended in +brackes (e.g. "local0.err<133>")</td> </tr> <tr> <td><b>iut</b></td> diff --git a/doc/rsyslog_recording_pri.html b/doc/rsyslog_recording_pri.html index cf11e3e5..a092980c 100644 --- a/doc/rsyslog_recording_pri.html +++ b/doc/rsyslog_recording_pri.html @@ -44,13 +44,13 @@ from the syslog message when output is written. Everything outside of the percent signs is literal text, which is simply written as specified.</p> <p>Thankfully, rsyslog provides message properties for the priority. These are called "PRI", "syslogfacility" and "syslogpriority" (case is important!). They are numerical -values. Starting with rsyslog 1.13.4, there is also a property "PRI-text", which -contains the priority in friendly text format (e.g. "syslog.info"). For the rest +values. Starting with rsyslog 1.13.4, there is also a property "pri-text", which +contains the priority in friendly text format (e.g. "local0.err<133>"). For the rest of this article, I assume that you run version 1.13.4 or higher.</p> <p>Recording the priority is now a simple matter of adding the respective field to the template. It now looks like this:</p> <p align="center"> -<code>$template TraditionalFormatWithPRI,"%PRI-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"</code> +<code>$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"</code> </p> <p>Now we have the right template - but how to write it to a file? You probably have a line like this in your syslog.conf:</p> |