summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* imrelp: properly initialize certifcate parametersRainer Gerhards2013-06-251-0/+3
|
* Merge branch 'v7-stable'Rainer Gerhards2013-06-251-2/+0
|\
| * imfile: remove redundant error mesageRainer Gerhards2013-06-251-2/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-253-4/+5
|\|
| * typo fix ("listner" vs. "listener")Michael Biebl2013-06-252-2/+2
| |
| * imtcp: permit parameter name with typo for backward compatibilityRainer Gerhards2013-06-251-1/+3
| |
| * imtcp: fix typo in config parameter nameMichael Biebl2013-06-251-2/+2
| |
| * bugfix: potential segfault on rsyslog termination in imudpRainer Gerhards2013-06-251-1/+0
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-243-9/+3
|\|
| * bugfix: RainerScript object required parameters were not properly checkedRainer Gerhards2013-06-242-8/+2
| | | | | | | | this clould result to segfaults on startup if parameters were missing.
| * bugfix: omrelp "template" parameter is NOT requiredRainer Gerhards2013-06-241-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-241-0/+4
|\| | | | | | | | | Conflicts: ChangeLog
| * impstats: solve build problem on FreeBSDRainer Gerhards2013-06-241-0/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458
* | mmfields: add "jsonRoot" parameterRainer Gerhards2013-06-241-3/+12
| |
* | omrelp: add tls.authmode parameterRainer Gerhards2013-06-211-0/+12
| |
* | omrelp: add tls.authmode parameterRainer Gerhards2013-06-211-0/+12
| |
* | omrelp: disable action on auth failureRainer Gerhards2013-06-211-6/+11
| | | | | | | | For almost all cases, it makes no sense to try to reconnect.
* | omrelp: emit error message on peer authentication failureRainer Gerhards2013-06-212-2/+12
| |
* | imrelp: emit error message on authentication errorRainer Gerhards2013-06-201-0/+9
| |
* | minor cleanupRainer Gerhards2013-06-201-5/+0
| |
* | omrelp: add permittedPeer handling (authorization)Rainer Gerhards2013-06-201-1/+24
| |
* | 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.
* | imrelp: support for setting permitted peers (client authentication) addedRainer Gerhards2013-06-181-1/+23
| |
* | imrelp: add support for impstatsRainer Gerhards2013-06-181-1/+30
| |
* | 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-1/+1
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * 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-171-1/+4
|\|
| * imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-171-1/+1
| | | | | | | | No regression, this was in recently written, never-released code.
| * implement new ratelimiting mode for imjournalRainer Gerhards2013-06-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+31
|\|
| * Add IgnorePreviousMessages option to imjournal.Milan Bartos2013-06-171-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 'tmp' into v7-stableRainer Gerhards2013-06-171-3/+3
| |\ | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| | * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-171-3/+3
| | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
* | | Merge branch 'tmp'Rainer Gerhards2013-06-171-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| * | | Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-171-3/+3
| | |/ | |/| | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
* | | 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-151-8/+23
|\| |
| * | imjournal: add ratelimiting capabilityRainer Gerhards2013-06-151-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-12/+31
|\| |
| * | bugfix: prevent a segfault if state file is not definedTomas Heinrich2013-06-141-12/+31
| | |
* | | 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-122-1/+10
| | |
* | | imrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-121-0/+6
| | |
* | | imrelp: new parameter "compression.dhbits"Rainer Gerhards2013-06-121-0/+8
| | | | | | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation
* | | Merge branch 'master-tcp-compress-stream'Rainer Gerhards2013-06-121-12/+167
|\ \ \
| * \ \ Merge branch 'master' into master-tcp-compress-streamRainer Gerhards2013-05-076-43/+658
| |\ \ \
| * | | | tcp strm compression: add stats countersRainer Gerhards2013-04-181-5/+23
| | | | |