summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Added support for command line parameters in "binary" config setting of omprog.Andre Lorbach2013-06-181-16/+113
| | | | | | | | | | | | | | - Command line Parameter Support is only available with the new config format, here is a sample: action(type="omprog" binary="/path/omprog.py --option=value --option2=\"value 2\"") - Also fixed a seqfault wenn using the new config format and no template parameter was specified.
* | Merge remote branch 'upstream/master'Andre Lorbach2013-06-18973-0/+149590
|\ \
| * | imrelp: support for setting permitted peers (client authentication) addedRainer Gerhards2013-06-182-1/+24
| | |
| * | imrelp: add support for impstatsRainer Gerhards2013-06-182-1/+31
| | |
| * | imrelp: switch to newer-style librelp interfaceRainer Gerhards2013-06-181-2/+4
| | | | | | | | | | | | | | | | | | | | | This interface permits us to pass a user-pointer to librelp, which it will pass back to us on message reception. This is the foundation for some more advanced features that require access to imrelp's configration object.
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-38/+34
| |\|
| | * doc: remove duplicate omfile descriptionsRainer Gerhards2013-06-171-38/+34
| | | | | | | | | | | | | | | always bears the risk that one or another is not maintained when an update happpens
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-2/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * prepare for 7.4.1 releasev7.4.1Rainer Gerhards2013-06-173-3/+3
| | |
| | * imjournal: rate limiter was destructed too earlyRainer Gerhards2013-06-171-1/+1
| | | | | | | | | | | | | | | Too quick hacking, obviously, one too late, one too early, now it should fit ;) Thanks to Tomas Heinrich for pointing this out.
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-173-3/+22
| |\|
| | * imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-172-2/+2
| | | | | | | | | | | | No regression, this was in recently written, never-released code.
| | * implement new ratelimiting mode for imjournalRainer Gerhards2013-06-173-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;)
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-2/+2
| |\|
| | * doc: legacy parameter description in imjournal slightly wrongRainer Gerhards2013-06-171-2/+2
| | |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-9/+41
| |\|
| | * doc cleanupRainer Gerhards2013-06-171-5/+5
| | |
| | * Add IgnorePreviousMessages option to imjournal.Milan Bartos2013-06-172-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies whether imjournal should ignore messages that are currently in journal. This option is only used when there is no StateFile to avoid message loss. modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c Conflicts: doc/imjournal.html plugins/imjournal/imjournal.c
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-25/+18
| |\| | | | | | | | | | | | | Conflicts: doc/imjournal.html
| | * doc: improve imjournal docRainer Gerhards2013-06-171-17/+19
| | | | | | | | | | | | most importantly, convert sample to new-style config format
| | * fix imjournal doc after merging patchRainer Gerhards2013-06-171-11/+2
| | | | | | | | | | | | | | | ... was changed in the interim, so the result of the merge was sub-optimal ;)
| | * Merge branch 'tmp' into v7-stableRainer Gerhards2013-06-172-3/+14
| | |\ | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| | | * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | | | | | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
| * | | Merge branch 'tmp'Rainer Gerhards2013-06-172-3/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| | * | | Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | | |/ | | |/| | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-160-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| | | | | | | | | | | | | | | | thanks to David Lang for alerting me.
| | * | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| | | |
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| | | | | | | | | | | | | | | | thanks to David Lang for alerting me.
| * | | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| | | |
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-161-8/+56
| |\| |
| | * | doc: improve imjournal doc and add ratelimiting paramtersRainer Gerhards2013-06-161-8/+56
| | | |
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-0/+4
| |\| |
| | * | imjournal: add legacy config statement for ratelimitingRainer Gerhards2013-06-151-0/+4
| | | |
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-152-8/+32
| |\| |
| | * | imjournal: add ratelimiting capabilityRainer Gerhards2013-06-152-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 Gerhards2013-06-156-15/+46
| |\| |
| | * | doc: warn about using imjournalRainer Gerhards2013-06-151-0/+8
| | | | | | | | | | | | | | | | do to bugs in systemd, the module can lead to a DoS to the local machine
| | * | doc: mention contributed patch in ChangeLogRainer Gerhards2013-06-141-0/+1
| | | |
| | * | bugfix: prevent a segfault if state file is not definedTomas Heinrich2013-06-141-12/+31
| | | |
| | * | systemd: use service type notifyCristian Rodríguez2013-06-142-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 recommendationsCristian Rodríguez2013-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Those are documented here: http://www.freedesktop.org/wiki/Software/systemd/syslog/
| | * | bugfix: prevent calling tellLostCnt() twiceTomas Heinrich2013-06-121-1/+1
| | | |
| | * | bugfix: prevent another endless loop in the ratelimiterTomas Heinrich2013-06-121-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.
| * | | cleanupRainer Gerhards2013-06-141-1/+0
| | | |
| * | | [io]mrelp: support for certificate parametersRainer Gerhards2013-06-132-0/+46
| | | |
| * | | omrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-125-1/+30
| | | |
| * | | imrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-122-0/+17
| | | |
| * | | imrelp: new parameter "compression.dhbits"Rainer Gerhards2013-06-124-1/+22
| | | | | | | | | | | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation
| * | | add BSD-specific syslog facilitiesRainer Gerhards2013-06-122-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | * "console" * "bsd_security" - this is called "security" under BSD, but that name was unfortunately already taken by some standard facility. So I