5939 Commits

Author SHA1 Message Date
Rainer Gerhards
712bf14db2 Merge branch 'master-mmfields'
Conflicts:
	Makefile.am
	configure.ac
2013-06-11 17:59:22 +02:00
Rainer Gerhards
d16f0496de prepare 7.5.0 release v7.5.0 2013-06-11 10:52:04 +02:00
Tomas Heinrich
6138ced6ce imuxsock: don't report an error message for $OmitLocalLogging 2013-06-10 18:04:15 +02:00
Rainer Gerhards
dc4d262886 Merge branch 'v7-stable'
Conflicts:
	ChangeLog
2013-06-10 17:47:10 +02:00
Rainer Gerhards
940327046c doc bugfix: imrelp does not have a v6+ "ruleset" config parameter 2013-06-10 17:45:40 +02:00
Rainer Gerhards
bb3143655d imrelp: implement "ruleset" module parameter 2013-06-10 08:57:05 +02:00
Rainer Gerhards
5d061ce852 doc: add contributed patches to ChangeLog 2013-06-10 08:07:50 +02:00
Tomas Heinrich
573e3fb27c bugfix: prevent an endless loop in the ratelimiter
If messages are being dropped because of ratelimiting, an internal
message is generated to inform about this fact. This should happen
only uppon the firs occurance but the counter that tracks the number
of dropped messages was incremented only after sending the message. If
the message itself gets ratelimited, an endless loop spins out of
control. Thanks to Jerry James for notifying about this.
2013-06-10 08:06:36 +02:00
Tomas Heinrich
fc72c6cccc bugfix: be more tolerant to malformed journal fields
This prevents a segfault when a malformed journal entry field doesn't
contain an equal sign. Should not ever happen but was actually
triggered by a real bug in systemd journal.
2013-06-10 08:06:35 +02:00
Rainer Gerhards
91b736b1f0 add minimal doc for contributed mmcount module 2013-06-09 18:18:47 +02:00
Bala.FA
2eb19f15a4 mmcount: message modification plugin which counts messages
This module provides the capability to count log messages by severity
or json property of given app-name.  The count value is added into the
log message as json property named 'mmcount'

Example usage of the module in the configuration file

 module(load="mmcount")

 # count each severity of appname gluster
 action(type="mmcount" appname="gluster")

 # count each value of gf_code of appname gluster
 action(type="mmcount" appname="glusterd" key="!gf_code")

 # count value 9999 of gf_code of appname gluster
 action(type="mmcount" appname="glusterfsd" key="!gf_code" value="9999")

 # send email for every 50th mmcount
 if $app-name == 'glusterfsd' and $!mmcount <> 0 and $!mmcount % 50 == 0 then {
    $ActionMailSMTPServer smtp.example.com
    $ActionMailFrom rsyslog@example.com
    $ActionMailTo glusteradmin@example.com
    $template mailSubject,"50th message of gf_code=9999 on %hostname%"
    $template mailBody,"RSYSLOG Alert\r\nmsg='%msg%'"
    $ActionMailSubject mailSubject
    $ActionExecOnlyOnceEveryInterval 30
    :ommail:;RSYSLOG_SyslogProtocol23Format
 }

Signed-off-by: Bala.FA <barumuga@redhat.com>
2013-06-09 18:11:14 +02:00
Rainer Gerhards
98d731554b mmfields: store parsed-out fields in rsyslog dictionary 2013-06-09 10:40:58 +02:00
Rainer Gerhards
7e7e92be6e mmfields/milestone: fields properly extracted
but not yet stored in rsyslog dictionary
2013-06-07 18:02:34 +02:00
Rainer Gerhards
68a3e0b2f5 mmfields: created skeleton for new module; build system integration 2013-06-07 14:14:11 +02:00
Rainer Gerhards
20067e7fbc [io]mrelp: add TLS compression support 2013-06-07 12:13:14 +02:00
Hongfei Cheng
4786603019 bugfix imzmq3: potential segfault on startup
if no problem happend at startup, everything went fine
2013-06-06 16:09:46 +02:00
Rainer Gerhards
f27cff39a3 Merge branch 'nextmaster'
Conflicts:
	ChangeLog
2013-06-06 11:55:23 +02:00
Rainer Gerhards
82688df6b5 prepare for 7.4.0 release v7.4.0 2013-06-05 11:34:25 +02:00
Rainer Gerhards
92e55a8b1b 0mq fixes; credits to Hongfei Cheng and Brian Knox 2013-06-04 18:15:10 +02:00
Tomas Heinrich
6e72fa6900 build: don't check for libs that are not needed 2013-06-03 18:21:15 +02:00
Tomas Heinrich
7e693b19f0 doc: correct omfile documentation
Some of the options affect all files, not just dynafiles.
2013-06-03 18:18:45 +02:00
Tomas Heinrich
cc62c352ea doc: clarify RSYSLOG_DEBUG format 2013-06-03 18:18:45 +02:00
Tomas Heinrich
0062d8e2b7 bugfix: postpone the start of the imgssapi listener
If the listen socket is opened earlier (during configuration parsing),
it is closed again during early init.

The start has been postponed to the 'runInput' stage, which has an
unpleasant side effect that it will fail if the priviledges are
dropped.

The code should be eventually fixed to support the new config system.
2013-06-03 18:18:45 +02:00
Rainer Gerhards
6ded646baf bugfix: $template statement with multiple spaces lead to invalid tpl name
If multiple spaces were used in front of the template name, all but one
of them became actually part of the template name. So
$template   a,"..." would be name "  a", and as such "a" was not
available, e.g. in
*.* /var/log/file;a
This is a legacy config problem. As it was unreported for many years,
no backport of the fix to old versions will happen.
This is a long-standing bug that was only recently reported by forum
user mc-sim.
Reference: http://kb.monitorware.com/post23448.html
2013-05-27 11:01:29 +02:00
Rainer Gerhards
5605b1b60a doc bugfix: ReadMode wrong in imfile doc, two values were swapped
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=450
Thanks to jokajak@gmail.com for mentioning this
2013-05-26 16:00:14 +02:00
Rainer Gerhards
054c6b595d add --enable-cached-man-pages ./configure option
permits to build rsyslog on a system where rst2man is not installed. In
that case, cached versions of the man pages are used (they were built
during "make dist", so they should be current for the version in
question.
2013-05-26 15:56:24 +02:00
Tomas Heinrich
ef6794aae0 bugfix: imjournal should respect termination request
sd_journal_wait() ignores EINTR and this behavior interferes with
module's termination signaling. Therefore, poll() is used instead.
2013-05-26 15:19:57 +02:00
Tomas Heinrich
388665abdf bugfix: imjournal's thread shouldn't be canceled
Because of cancelation, the correct possition in the journal was
lost. This resulted in duplicate messages appearing in the logs.
2013-05-26 15:19:57 +02:00
Rainer Gerhards
fc88ff2ed2 doc: add imjournal improvement to ChangeLog 2013-05-22 17:00:27 +02:00
Milan Bartos
b1a2e4dfb6 Eliminate sleep in imjournal code with sd_journal_wait
modified:   plugins/imjournal/imjournal.c
2013-05-22 17:00:02 +02:00
Tomas Heinrich
b8133fb423 Remove redundat cflags and links to libraries
This prevents linking with libee, liblognorm and libgcrypt when not
necessary.
2013-05-20 21:32:50 +02:00
Tomas Heinrich
45d9cf3c63 Revert "bugfix: problem in build system (especially when cross-compiling)"
This reverts commit 813c9c7f524976ef598864afbb729bca31557c32.

Removing references to libee.h in the previous commit solves the build
issue so the cflag shoudn't be needed after all.
2013-05-20 21:32:50 +02:00
Tomas Heinrich
b424b8c249 Don't #include libestr and libee headers when not necessary
Through msg.h, many unrelated components needlessly required
LIBEE_CFLAGS.
2013-05-20 21:32:49 +02:00
Tomas Heinrich
2203a324c8 Clean up warnings in imjournal and omjournal 2013-05-20 21:18:46 +02:00
Tomas Heinrich
faeaaf2d6c Drop unneeded macro definition
The macro itself was a malformed version of "_GNU_SOURCE" and thus had
no effect. It is not needed as this macro is already defined
via AC_GNU_SOURCE.
2013-05-20 21:18:46 +02:00
Milan
864421ed5b Imjournal state files can be stored in WorkDirectory
When the imjournal state file path doesn't start with '/',
then it's by default stored in WorkDirectory. When path
starts with '/', full path is used.
2013-05-20 21:18:46 +02:00
Jan Gerhards
127671fed1 doc: describe relp tls parameters 2013-05-15 10:47:54 +02:00
Rainer Gerhards
e89e0c9574 fix handling of unbounded blocks 2013-05-16 10:05:14 +02:00
Rainer Gerhards
c1c441562b fix regression on unencrypted queue files 2013-05-16 10:04:04 +02:00
Rainer Gerhards
a336dc690f cleanup 2013-05-16 10:01:02 +02:00
Rainer Gerhards
afe14ce2f6 complete handle multiple blocks in encrypted queue files 2013-05-16 09:49:22 +02:00
Rainer Gerhards
3aeafbdfad properly handle padding bytes when reading queue files 2013-05-16 07:58:50 +02:00
Rainer Gerhards
940bdc4c41 enable ability to read existing encrypted queue file 2013-05-15 18:49:07 +02:00
Rainer Gerhards
9205c5541b clean up crypto provider state files on queue file rollover 2013-05-15 12:59:11 +02:00
Rainer Gerhards
3382800afc do not try to write to read-open encryption state file 2013-05-15 12:19:18 +02:00
Rainer Gerhards
bad876b265 clean up crypto provider state files on queue file close 2013-05-15 12:08:54 +02:00
Rainer Gerhards
1f2b6f1a9b bugfix: potential hang *in debug mode* on rsyslogd termination 2013-05-15 07:45:33 +02:00
Rainer Gerhards
2f958c6f55 prepare for 7.3.15 release v7.3.15 2013-05-14 18:43:39 +02:00
Winfried
813c9c7f52 bugfix: problem in build system (especially when cross-compiling)
Thanks to Tomas Heinrich and winfried_mb2@xmsnet.nl for the patch.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=445
2013-05-14 18:25:44 +02:00
Rainer Gerhards
b43d5592dd bugfix: .logsig files had tlv16 indicator bit at wrong offset 2013-05-14 16:22:31 +02:00