Merge branch 'v7-stable'

Conflicts:
	doc/debug.html
This commit is contained in:
Rainer Gerhards 2013-10-07 11:22:54 +02:00
commit 0595d5e045
13 changed files with 75 additions and 4 deletions

View File

@ -161,6 +161,11 @@ SIGUSR1 and SIGUSR2 are completely ignored.
<p>When running in any of the debug modes (including on demand mode), an interactive
instance of rsyslogd can be aborted by pressing ctrl-c.
<p>
<h2>See Also</h2>
<ul>
<li><a href="http://www.rsyslog.com/how-to-use-debug-on-demand/">How to use debug on demand</a></li>
</ul>
</p>
<p>[<a href="manual.html">manual index</a>] [<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>

View File

@ -95,6 +95,11 @@ If set to on, stats messages are emitted as structured cee-enhanced syslog. If
set to off, legacy format is used (which is compatible with pre v6-rsyslog).
</li>
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/rsyslog-statistic-counter/">rsyslog statistics counter</a></li>
</ul>
</p>
<b>Caveats/Known Bugs:</b>
<ul>
<li>This module MUST be loaded right at the top of rsyslog.conf, otherwise

View File

@ -180,7 +180,13 @@ oneself has the advantage that a limited amount of messages may be
queued by the OS if rsyslog is not running.
</li>
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/what-are-trusted-properties/">What are "trusted properties"?</a></li>
<li><a href="http://www.rsyslog.com/why-does-imuxsock-not-work-on-solaris/">Why does imuxsock not work
on Solaris?</a></li>
</ul>
</p>
<b>Caveats/Known Bugs:</b><br>
<ul>
<li>There is a compile-time limit of 50 concurrent sockets. If you need more, you need to
@ -270,7 +276,7 @@ equivalent to: SysSock.IgnoreTimestamp.</li>
<li><b>$InputUnixListenSocketHostName</b> &lt;hostname&gt; equivalent to: HostName.</li>
<li><b>$InputUnixListenSocketAnnotate</b> &lt;on/<b>off</b>&gt; equivalent to: Annotate.</li>
<li><b>$SystemLogSocketAnnotate</b> &lt;on/<b>off</b>&gt; equivalent to: SysSock.Annotate.</li>
<li><b>$SystemLogParseTrusted</b> &lt;on/<b>off</b>&gt; equivalent to: SysSock.ParseTrusted.</li>
<li><b>$SystemLogSocketParseTrusted</b> &lt;on/<b>off</b>&gt; equivalent to: SysSock.ParseTrusted.</li>
</ul>
<b>Caveats/Known Bugs:</b><br>

View File

@ -46,6 +46,17 @@ parameter.
<li>$mmnormalizeUseRawMsg &lt;on/off&gt; - equivalent to the "useRawMsg"
parameter.
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/normalizer-first-steps-for-mmnormalize/">First steps for mmnormalize</a></li>
<li><a href="http://www.rsyslog.com/log-normalization-and-special-characters/">Log normalization and
special characters</a></li>
<li><a href="http://www.rsyslog.com/log-normalization-and-the-leading-space/">Log normalization and
the leading space</a></li>
<li><a href="http://www.rsyslog.com/using-rsyslog-mmnormalize-module-effectively-with-adiscon-loganalyzer/">Using
mmnormalize effectively with Adiscon LogAnalyzer</a></li>
</ul>
</p>
<b>Caveats/Known Bugs:</b>
<p>None known at this time.
</ul>

View File

@ -114,6 +114,11 @@
"<a href="cryprov_gcry.html">gcry</a>".<br></li><br>
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/how-to-sign-log-messages-through-signature-provider-guardtime/">Sign log messages through signature provider Guardtime</a></li>
</ul>
</p>
<p><b>Caveats/Known Bugs:</b></p>
<ul>
<li>One needs to be careful with log rotation if signatures and/or encryption

View File

@ -123,6 +123,11 @@ a specific version of the rsyslog documentation</a>.
Permits to resend the last message when a connection is reconnected. This setting affects TCP-based syslog, only. It is most useful for traditional, plain TCP syslog. Using this protocol, it is not always possible to know which messages were successfully transmitted to the receiver when a connection breaks. In many cases, the last message sent is lost. By switching this setting to "yes", rsyslog will always retransmit the last message when a connection is reestablished. This reduces potential message loss, but comes at the price that some messages may be duplicated (what usually is more acceptable). <br></li><br>
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/encrypted-disk-queues/">Encrypted Disk Queues</a></li>
</ul>
</p>
<p><b>Caveats/Known Bugs:</b></p><ul><li>None.</li></ul>
<p><b>Sample:</b></p>
<p>The following command sends all syslog messages to a remote server via TCP port 10514.</p>

View File

@ -136,6 +136,11 @@ $ActionOmrulesetRulesetName nested
# of course, we can have "regular" actions alongside :omrulset: actions
*.* /path/to/general-message-file.log
</textarea>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/rulesets-and-rsyslog-7-2/">Calling rulesets since rsyslog 7.2</a></li>
</ul>
</p>
<p><b>Caveats/Known Bugs:</b>
<p>The current configuration file language is not really adequate for a complex construct
like omruleset. Unfortunately, more important work is currently preventing me from redoing the

View File

@ -746,13 +746,15 @@ use drop-cc and "drop-cc,escape-cc" will use escape-cc mode.
options. It was initially introduced to support the "jsonf" option, for which it provides
the capability to set an alternative field name. If it is not specified, it defaults to
the property name.
<h2>Further Links</h2>
<b>See also</b>
<ul>
<li>Article on "<a href="rsyslog_recording_pri.html">Recording
the Priority of Syslog Messages</a>" (describes use of templates
to record severity and facility of a message)</li>
<li><a href="rsyslog_conf.html">Configuration file
format</a>, this is where you actually use the property replacer.</li>
<li><a href="http://www.rsyslog.com/what-is-the-difference-between-timereported-and-timegenerated/">
Difference between timereported and timegenerated.</li>
</ul>
<p>[<a href="manual.html">manual index</a>]
[<a href="rsyslog_conf.html">rsyslog.conf</a>]

View File

@ -386,6 +386,11 @@ it terminates. This includes data elements there were begun being processed by
workers that needed to be cancelled due to too-long processing. For a large
queue, this operation may be lengthy. No timeout applies to a required shutdown
save.</p>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/encrypted-disk-queues/">Encrypted Disk Queues</a></li>
</ul>
</p>
[<a href="manual.html">manual index</a>]
[<a href="rsyslog_conf.html">rsyslog.conf</a>]
[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>

View File

@ -275,6 +275,11 @@ supported (except for "not" as outlined above). Please note that while
it is possible to query facility and severity via property-based
filters, it is far more advisable to use classic selectors (see above)
for those cases.</p>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/filter-optimization-with-arrays/">Filter optimization with arrays</a></li>
</ul>
</p>
<p>[<a href="manual.html">manual index</a>]
[<a href="rsyslog_conf.html">rsyslog.conf</a>]
[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>

View File

@ -524,7 +524,13 @@ $template TraditionalForwardFormat,"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag:1:3
<br><br>
$template StdSQLFormat,"insert into SystemEvents (Message, Facility, FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, '%timereported:::date-mysql%', '%timegenerated:::date-mysql%', %iut%, '%syslogtag%')",SQL
</code></p>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/how-to-bind-a-template/">How to bind a template</a></li>
<li><a href="http://www.rsyslog.com/adding-the-bom-to-a-message/">Adding the BOM to a message</a></li>
<li><a href="http://www.rsyslog.com/article60/">How to separate log files by host name of the sending device</a></li>
</ul>
</p>
<p>[<a href="manual.html">manual index</a>]
[<a href="rsyslog_conf.html">rsyslog.conf</a>]
[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>

View File

@ -81,5 +81,10 @@ of the distribution name.
<p>If you do not find a suitable package for your distribution, there is no reason
to panic. It is quite simple to install rsyslog from the source tarball, so you
should consider that.
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/how-to-use-the-ubuntu-repository/">How to use the Ubuntu repository</a></li>
</ul>
</p>
</body>
</html>

View File

@ -64,6 +64,12 @@ sig.keepRecordHashes requries). Note that both Tree and Record
hashes can be kept inside the signature file.
</li>
</ul>
<p><b>See Also</b>
<ul>
<li><a href="http://www.rsyslog.com/how-to-sign-log-messages-through-signature-provider-guardtime/">How
to sign log messages through signature provider Guardtime</a></li>
</ul>
</p>
<b>Caveats/Known Bugs:</b>
<ul>
<li>currently none known