summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-12-19 11:20:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-19 11:20:59 +0100
commit6bcc1e371b8c27b227a7c87f475063f7fddfd44f (patch)
tree0941df531236de6a65b5ddaf02a07020fdc11a97 /doc
parentbe2383f2b80d4fb83abd2765e6467e8d7614ab49 (diff)
parent5fe837bf7dbdcc245ee233feb1fbcc6d052a4898 (diff)
downloadrsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.gz
rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.tar.xz
rsyslog-6bcc1e371b8c27b227a7c87f475063f7fddfd44f.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: ChangeLog action.c
Diffstat (limited to 'doc')
-rw-r--r--doc/imfile.html4
-rw-r--r--doc/imgssapi.html5
-rw-r--r--doc/omprog.html43
-rw-r--r--doc/rsyslog_conf_modules.html1
4 files changed, 49 insertions, 4 deletions
diff --git a/doc/imfile.html b/doc/imfile.html
index 60bbbeea..7961729b 100644
--- a/doc/imfile.html
+++ b/doc/imfile.html
@@ -15,7 +15,9 @@ text file is a file consisting of printable characters with lines
being&nbsp;delimited by LF.</p>
<p>The file is read line-by-line and any line read is passed to
rsyslog's rule engine. The rule engine applies filter conditons and
-selects which actions needs to be carried out.</p>
+selects which actions needs to be carried out. Empty lines are <b>not</b>
+processed, as they would result in empty syslog records. They are simply
+ignored.</p>
<p>As new lines are written they are taken from the file and
processed. Please note that this happens based on a polling interval
and not immediately. The file monitor support file rotation. To fully
diff --git a/doc/imgssapi.html b/doc/imgssapi.html
index ec183fe7..dd90fec7 100644
--- a/doc/imgssapi.html
+++ b/doc/imgssapi.html
@@ -38,7 +38,7 @@ Sets the maximum number of sessions supported</li>
<p>This sets up a GSS server on port 1514 that also permits to
receive plain tcp syslog messages (on the same port):<br>
</p>
-<textarea rows="15" cols="60">$ModLoad imtcp # needs to be done just once
+<textarea rows="15" cols="60">$ModLoad imgssapi # needs to be done just once
$InputGSSServerRun 1514
$InputGSSServerPermitPlainTCP on
</textarea>
@@ -47,8 +47,7 @@ $InputGSSServerPermitPlainTCP on
<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 &copy; 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 3 or higher.</font></p>
</body></html>
diff --git a/doc/omprog.html b/doc/omprog.html
new file mode 100644
index 00000000..471ab224
--- /dev/null
+++ b/doc/omprog.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><title>omprog output module - sending messages to a program</title>
+<a href="features.html">back</a>
+</head>
+<body>
+<h1>Program integration Output module</h1>
+<p><b>Module Name:&nbsp;&nbsp;&nbsp; omprog</b></p>
+<p><b>Available since:&nbsp;&nbsp;&nbsp;</b> 4.3.0</p>
+<p><b>Author: </b>Rainer Gerhards
+&lt;rgerhards@adiscon.com&gt;</p>
+<p><b>Description</b>:</p>
+<p>This module permits to integrate arbitrary external programs into rsyslog's
+logging. It is similar to the "execute program (^)" action, but offers better security
+and much higher performance. While "execute program (^)" can be a useful tool for
+executing programs if rare events occur, omprog can be used to provide massive
+amounts of log data to a program.
+<p>Executes the configured program and feeds log messages to that binary via
+stdin. The binary is free to do whatever it wants with the supplied data.
+If the program terminates, it is re-started. If rsyslog terminates, the
+program's stdin will see EOF. The program must than terminate. The message format
+passed to the program can, as usual, be modified by defining rsyslog templates.
+<p>Note that each time an omprog action is defined, the corresponding programm
+is invoked. A single instance is <b>not</b> being re-used. There are arguments pro and
+con re-using existing binaries. For the time being, it simply is not done. In the future,
+we may add an option for such pooling, provided that some demand for that is voiced.
+You can also mimic the same effect by defining multiple rulesets and including them (at
+the price of some slight performance loss).
+<p><b>Configuration Directives</b>:</p>
+<ul>
+<li><b>$ActionOMProgBinary</b> &lt;binary&gt;<br>
+The binary program to be executed.
+</ul>
+<b>Caveats/Known Bugs:</b>
+<p>Currently none known.
+<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>]
+[<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>
+Copyright &copy; 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 3 or higher.</font></p>
+</body></html>
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html
index b03313f5..9fa35ccd 100644
--- a/doc/rsyslog_conf_modules.html
+++ b/doc/rsyslog_conf_modules.html
@@ -63,6 +63,7 @@ generic database output module (Firebird/Interbase, MS SQL, Sybase,
SQLLite, Ingres, Oracle, mSQL)</li>
<li><a href="ommail.html">ommail</a> -
permits rsyslog to alert folks by mail if something important happens</li>
+<li><a href="omprog.html">omprog</a> - permits sending messages to a program for custom processing</li>
<li><a href="omoracle.html">omoracle</a> - output module for Oracle (native OCI interface)</li>
<li><a href="omudpspoof.html">omudpspoof</a> - output module sending UDP syslog messages with a spoofed address</li>
<li><a href="omuxsock.html">omuxsock</a> - output module Unix domain sockets</li>