Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -25/+18 |
|\ | | | | | | | | | Conflicts: doc/imjournal.html | ||||
| * | doc: improve imjournal doc | Rainer Gerhards | 2013-06-17 | 1 | -17/+19 |
| | | | | | | | | most importantly, convert sample to new-style config format | ||||
| * | fix imjournal doc after merging patch | Rainer Gerhards | 2013-06-17 | 1 | -11/+2 |
| | | | | | | | | | | ... was changed in the interim, so the result of the merge was sub-optimal ;) | ||||
| * | Merge branch 'tmp' into v7-stable | Rainer Gerhards | 2013-06-17 | 2 | -3/+14 |
| |\ | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| | * | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | Merge branch 'tmp' | Rainer Gerhards | 2013-06-17 | 2 | -3/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| * | | | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 2 | -3/+14 |
| | |/ | |/| | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-16 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
| * | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
* | | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
|\| | | |||||
| * | | doc: improve imjournal doc and add ratelimiting paramters | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -0/+4 |
|\| | | |||||
| * | | imjournal: add legacy config statement for ratelimiting | Rainer Gerhards | 2013-06-15 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 2 | -8/+32 |
|\| | | |||||
| * | | imjournal: add ratelimiting capability | Rainer Gerhards | 2013-06-15 | 2 | -8/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original imjournal code did not support ratelimiting at all. We now have our own ratelimiter. This can mitigate against journal database corruption, when the journal re-sends old data. This is a current bug in systemd journal, but we won't outrule this to happen in the future again. So it is better to have a safeguard in place. By default, we permit 20,000 messages witin 10 minutes. This may be a bit restrictive, but given the risk potential it seems reasonable. Users requiring larger traffic flows can always adjust the value. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 6 | -15/+46 |
|\| | | |||||
| * | | doc: warn about using imjournal | Rainer Gerhards | 2013-06-15 | 1 | -0/+8 |
| | | | | | | | | | | | | do to bugs in systemd, the module can lead to a DoS to the local machine | ||||
| * | | doc: mention contributed patch in ChangeLog | Rainer Gerhards | 2013-06-14 | 1 | -0/+1 |
| | | | |||||
| * | | bugfix: prevent a segfault if state file is not defined | Tomas Heinrich | 2013-06-14 | 1 | -12/+31 |
| | | | |||||
| * | | systemd: use service type notify | Cristian RodrÃguez | 2013-06-14 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a time window, between rsyslog reporting syntax errors and the daemon returning with failure, this may cause systemctl restart rsyslog to not report any error inmediately but later in the logs which is confusing to users. The appropiate steps to correct this annoyance is to notify systemd with a simple sd_notify(0, "READY=1"); just before entering the main loop. Tested in openSUSE 12.3/13.1 x86_64 | ||||
| * | | Fix rsyslog.service to comply with systemd recommendations | Cristian RodrÃguez | 2013-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Those are documented here: http://www.freedesktop.org/wiki/Software/systemd/syslog/ | ||||
| * | | bugfix: prevent calling tellLostCnt() twice | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | bugfix: prevent another endless loop in the ratelimiter | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The message that reports how many messages were lost due to ratelimiting was sent before reseting the state that led to it. If it itself got ratelimited, this could lead to an endless loop. | ||||
* | | | cleanup | Rainer Gerhards | 2013-06-14 | 1 | -1/+0 |
| | | | |||||
* | | | [io]mrelp: support for certificate parameters | Rainer Gerhards | 2013-06-13 | 2 | -0/+46 |
| | | | |||||
* | | | omrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 5 | -1/+30 |
| | | | |||||
* | | | imrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 2 | -0/+17 |
| | | | |||||
* | | | imrelp: new parameter "compression.dhbits" | Rainer Gerhards | 2013-06-12 | 4 | -1/+22 |
| | | | | | | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation | ||||
* | | | add BSD-specific syslog facilities | Rainer Gerhards | 2013-06-12 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | * "console" * "bsd_security" - this is called "security" under BSD, but that name was unfortunately already taken by some standard facility. So I | ||||
* | | | doc: add new feature to ChangeLog | Rainer Gerhards | 2013-06-12 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'master-tcp-compress-stream' | Rainer Gerhards | 2013-06-12 | 4 | -26/+345 |
|\ \ \ | |||||
| * | | | doc: more on tcp compression modes | Rainer Gerhards | 2013-06-12 | 2 | -0/+7 |
| | | | | |||||
| * | | | document new tcp compression mode | Rainer Gerhards | 2013-06-12 | 1 | -1/+30 |
| | | | | |||||
| * | | | Merge branch 'master' into master-tcp-compress-stream | Rainer Gerhards | 2013-05-07 | 32 | -100/+1005 |
| |\ \ \ | |||||
| * | | | | tcp strm compression: add stats counters | Rainer Gerhards | 2013-04-18 | 1 | -5/+23 |
| | | | | | |||||
| * | | | | tcp strm compression: add config parameters | Rainer Gerhards | 2013-04-18 | 2 | -16/+91 |
| | | | | | |||||
| * | | | | tcp strm compression: first PoC | Rainer Gerhards | 2013-04-18 | 2 | -17/+207 |
| | | | | | | | | | | | | | | | | | | | | NOT to be used for production, lots of things are missing | ||||
* | | | | | Merge branch 'master-mmfields' | Rainer Gerhards | 2013-06-11 | 4 | -1/+293 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac | ||||
| * | | | | | mmfields: store parsed-out fields in rsyslog dictionary | Rainer Gerhards | 2013-06-09 | 1 | -2/+13 |
| | | | | | | |||||
| * | | | | | mmfields/milestone: fields properly extracted | Rainer Gerhards | 2013-06-07 | 1 | -4/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | but not yet stored in rsyslog dictionary | ||||
| * | | | | | mmfields: created skeleton for new module; build system integration | Rainer Gerhards | 2013-06-07 | 4 | -0/+235 |
| | | | | | | |||||
* | | | | | | prepare 7.5.0 releasev7.5.0 | Rainer Gerhards | 2013-06-11 | 3 | -3/+3 |
| | | | | | | |||||
* | | | | | | imuxsock: don't report an error message for $OmitLocalLogging | Tomas Heinrich | 2013-06-10 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-10 | 4 | -16/+76 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | doc bugfix: imrelp does not have a v6+ "ruleset" config parameter | Rainer Gerhards | 2013-06-10 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | doc: add contributed patches to ChangeLog | Rainer Gerhards | 2013-06-10 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | bugfix: prevent an endless loop in the ratelimiter | Tomas Heinrich | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |