rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 10:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into newqueue

Browse Source 
Conflicts:
	tools/syslogd.c
This commit is contained in:
Rainer Gerhards 2009-10-15 11:57:53 +02:00
commit 73f83d963b
8 changed files with 44 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -203,6 +203,11 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-??
- imported changes from 4.5.6 and below
---------------------------------------------------------------------------
Version 4.5.6 [v4-beta] (rgerhards), 2009-09-??
- bugfix(minor): diag function returned wrong queue memeber count
for the main queue if an active DA queue existed. This had no relevance
to real deployments (assuming they are not running the debug/diagnostic
module...), but sometimes caused grief and false alerts in the
testbench.
- included some important fixes from v4-stable:
* bugfix: invalid handling of zero-sized messages
* bugfix: zero-sized UDP messages are no longer processed
@ -599,6 +604,8 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
- enhance: imrelp now also provides remote peer's IP address
[if librelp != 1.0.0 is used]
- bugfix: sending syslog messages with zip compression did not work
- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
in doc set (require TLS drivers)

3
doc/imrelp.html
View File

@ -35,6 +35,9 @@ Starts a RELP server on selected port</li>
<b>Caveats/Known Bugs:</b>
<ul>
<li>see description</li>
<li>To obtain the remote system's IP address, you need to have at least
librelp 1.0.0 installed. Versions below it return the hostname instead
of the IP address.</li>
</ul>
<p><b>Sample:</b></p>
<p>This sets up a RELP server on port 20514.<br>

123
doc/professional_support.html
View File

@ -1,112 +1,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<meta http-equiv="Content-Language" content="en"><title>Professional Support for Rsyslog</title>
<html>
<head>
<meta http-equiv="Content-Language" content="en">
<title>Professional Support for Rsyslog</title>
</head>
<body>
<h1>Professional Services for Rsyslog</h1>
<p>Professional services are being offered by <a href="http://www.adiscon.com">Adiscon</a>, the company
that sponsors rsyslog development. For details, please contact <a href="mailto:info%40adiscon.com">Adiscon Sales</a>.&nbsp;</p>
<h3>EMail Support Service</h3>
Price: 99.00 EURO <br>
Duration: 180 days
<br>
Support level: 8x5
<p>Purchase rsyslog support directly from the source. This
contract provides priority email support. It is a great option if you
need to provide proof of software support in your organization. This
contract provides</p>
<ul>
<li>unlimited email support tickets during validity
</li>
<li><span style="font-weight: bold;">fixes for</span>
current and <span style="font-weight: bold;">past rsyslog
releases</span>
</li>
<li>advise on how to implement rsyslog in the best possible
way.
</li>
</ul>
<p>Under this contract, fixes for old rsyslog releases will be
provided / created, provided that it is possible to do that with the
code base in question. Phone support is not included.</p>
<h3>Custom-Written Config File</h3>
Price: 29.00 EURO
<br>
Duration: N/A
<br>
Support level: 8x5
<p>Creating rsyslog config files is easy - but if you would like
to have that extra feature and have no time to do it, this service is
for you. Important: BEFORE you purchase this service, contact us and
inquire (via <a href="mailto:info%40adiscon.com">info@adiscon.com</a>)
whether or not your desired result can be achieved via rsyslog. Once
this is clear, order the service and we will ship a custom-made
configuration file within 5 working days (at latest, most often much
faster). For security reasons, we will not put passwords into the
configuration file, but will place easy to read comments in the places
where you need to put them in. The agreement is governed under German
law. You may also purchase this service if you would like to have your
own configuration file reviewed, e.g. for auditing purposes.</p>
<h3>Local Installation Support</h3>
<p>If you intend to install rsyslog on your system but would like
to do so with minimal effort and according to your specification, you
can ask us to perform the installation for you. You get a perfect
installation, exactly like you needed, but without a need to
touch the system. This is a perfect choice for the busy administrator!
<p>In order to perform this work, we just need ssh access to your
system and the proper permissions.
<p>We charge a low one-time fee for this service. For details, please
contact <a href="mailto:info@adiscon.com">info@adiscon.com</a>.
<h3>Local Installation Maintenance</h3>
<p>If you used our services to set up the system, why not keep it
running perfectly with maintenance support? Under this contract, we
assure you run a recent build that does not interfere with your
environment and we even carry out change requests you may have. So this
is a hassle-free, everything cared about solution.
<p>Again, all we need to have is ssh access and the proper permissions
to your machine. Of course, work will only be carried out when you
expect us to do so. You are always in control of what happens. This
is a perfect outsourcing solution for those who would like to run
a great logging system but can not afford the time to keep it
in perfect shape!
<p>We charge a low monthly fee for this service. For details, please
contact <a href="mailto:info@adiscon.com">info@adiscon.com</a>.
<h3>Custom Development</h3>
<p>Do you need an exotic feature that otherwise would not be implemented?
Do you need something really quick, quicker than it is available via
the regular development schedule? Then, you may consider funding
development for a specific functionality. We are always looking for
interesting projects. If you hire us to to do the job, you can be sure
to get the best possible and probably quickest solution, because we are
obviously at the heart of the source code. No need to get aquainted to
anything, no risk of misunderstanding program concepts. Benefit from
our vast syslog experience.</p>
<p>Please note that custom development is not limited to rsyslog. We offer
a number of logging solutions and can also work as part of your time
for specific requirements. The opportunities are endless, just ask. We
will work with you on your requirements and provide a quote on the
estimated cost. Just write to <a href="mailto:sales@adiscon.com">sales@adiscon.com</a> for details.</p><h3>Consulting Services</h3>
<p>Do you have demanding logging requirements? Why not talk to a
real&nbsp;logging professional? Instead of trying to find the solution
like a needle in the haystack, talk to the team that brought rsyslog,
phpLogCon, the Windows MonitorWare products and other logging
solutions. We sweat logging for over 15 years now and can help quickly.
Depending on your needs, consulting can be carried out via email, the
phone or on your premises (for larger or local projects). Everything is
possible, it just depends on your needs. Consulting services are
available in English and German. Just mail <a href="mailto:sales@adiscon.com">sales@adiscon.com</a> what you are interested in and we will work with you on a proposal that fits your needs.
</p><p></p><p>All agreements are
governed under German law.
</p>
<body>
<h1><a href="http://www.rsyslog.com/Article412.phtml">Professional Services for Rsyslog</a></h1>
<p>Professional services are being offered by <a href="http://www.adiscon.com">Adiscon</a>, the company
that sponsors rsyslog development. For details, please contact <a href="mailto:info%40adiscon.com">Adiscon Sales</a>.</p>
<p>In an effort to keep the documentation set clean and enable Adiscon to enhance the
professional offerings, the actual
<a href="http://www.rsyslog.com/Article412.phtml">rsyslog service offering</a>
has been moved to a
<a href="http://www.rsyslog.com/Article412.phtml">separate page</a>.
Please follow that link for details.
<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>
<p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a>
project.<br>
Copyright&nbsp;© 2008 by <a href="http://www.gerhards.net/rainer">Rainer
Gerhards</a> and
Copyright &copy; 2008, 2009 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>
</body>
</html>

8
doc/status.html
View File

@ -2,7 +2,7 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
<p>This page reflects the status as of 2009-10-09.</p>
<p>This page reflects the status as of 2009-10-15.</p>
<h2>Current Releases</h2>
<p><b>v5 development:</b> 5.3.1 [2009-10-05] -
@ -15,9 +15,9 @@
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-167.phtml">download</a></p>
-->
<br><b>v5-beta:</b> 5.1.5 [2009-09-11] -
<a href="http://www.rsyslog.com/Article400.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-174.phtml">download</a>
<br><b>v5-beta:</b> 5.1.6 [2009-10-15] -
<a href="http://www.rsyslog.com/Article413.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-180.phtml">download</a>
<br><b>v4-beta:</b> 4.5.4 [2009-09-29] -
<a href="http://www.rsyslog.com/Article406.phtml">change log</a> -

8
plugins/imrelp/imrelp.c
View File

@ -81,14 +81,14 @@ isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((u
* are different from our rsRetVal. So we can simply use our own iRet system
* to fulfill the requirement.
* rgerhards, 2008-03-21
* TODO: we currently do not receive the remote hosts's IP. As a work-around, we
* use "???" for the time being. -- rgerhards, 2008-05-16
* Note: librelp 1.0.0 is required in order to receive the IP address, otherwise
* we will only see the hostname (twice). -- rgerhards, 2009-10-14
*/
static relpRetVal
onSyslogRcv(uchar *pHostname, uchar __attribute__((unused)) *pIP, uchar *pMsg, size_t lenMsg)
onSyslogRcv(uchar *pHostname, uchar *pIP, uchar *pMsg, size_t lenMsg)
{
DEFiRet;
parseAndSubmitMessage(pHostname, (uchar*) "[unset]", pMsg, lenMsg, PARSE_HOSTNAME,
parseAndSubmitMessage(pHostname, pIP, pMsg, lenMsg, PARSE_HOSTNAME,
eFLOWCTL_LIGHT_DELAY, pInputName, NULL, 0);
RETiRet;

1
tests/Makefile.am
View File

@ -90,6 +90,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/rfc5424-2.parse1 \
testsuites/rfc5424-3.parse1 \
testsuites/rfc5424-4.parse1 \
testsuites/malformed.parse1 \
testsuites/omod-if-array.conf \
testsuites/1.omod-if-array \
testsuites/1.field1 \

5
tests/testsuites/malformed1.parse1 Normal file
View File

@ -0,0 +1,5 @@
<131>Oct 8 23:05:06 10.321.1.123 05",result_code=200,b
131,local0,err,Oct 8 23:05:06,10.321.1.123,05",result_code=200,b,05",result_code=200,b
# a somewhat mangeld-with real-life sample of a malformed message
# the key here is not what is being parsed, but that we do not abort!
# NOTE: if a parser enhancement breaks the format, this is probably OK

2
tools/syslogd.c
View File

@ -409,7 +409,7 @@ diagGetMainMsgQSize(int *piSize)
{
DEFiRet;
assert(piSize != NULL);
*piSize = (pMsgQueue->bIsDA) ? pMsgQueue->pqDA->iQueueSize : 0;
*piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0;
*piSize += pMsgQueue->iQueueSize;
RETiRet;
}