summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-192-6/+5
|
* Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-198-28/+30
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * Merge branch 'beta'Rainer Gerhards2012-10-191-2/+2
| |\
| | * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
| | |\
| | | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | | | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | | |
| * | | | Merge branch 'beta'Rainer Gerhards2012-10-191-5/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
| | |\| |
| | | * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| | | | |
| * | | | Merge branch 'beta'Rainer Gerhards2012-10-181-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | | |
| * | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-181-5/+5
| |\ \ \ \
| | * | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each.
| * | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-173-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on.
| * | | | | Merge branch 'beta'Rainer Gerhards2012-10-172-3/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | | * | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | | |
| | | | * | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | | |
| | | | * | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | | | | |
| * | | | | Merge branch 'beta'Rainer Gerhards2012-10-161-8/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | | omruleset: update to new message submit APIs/ratelimiterRainer Gerhards2012-10-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with the notable exception, that this module actualy needs no rate-limiter by design!
* | | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-161-7/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | | * | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| | | * | | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-10-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| | * | | | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
* | | | | | imtcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-1/+12
| | | | | |
* | | | | | imdiag: add support for new (ratelimiting) msg submit interfaceRainer Gerhards2012-10-151-3/+7
| | | | | |
* | | | | | cosmetic: remove compiler warningRainer Gerhards2012-10-151-1/+1
| | | | | |
* | | | | | imudp: support for Linux-like ratelimiting addedRainer Gerhards2012-10-151-2/+14
| | | | | |
* | | | | | imptcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-1/+11
| | | | | |
* | | | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-154-97/+24
| | | | | |
* | | | | | milestone: convert imuxsock to ratelimitAddMsg() interfaceRainer Gerhards2012-10-151-30/+1
| | | | | |
* | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-152-1/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-1/+1
| |\| | | |
| | * | | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one.
| * | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+6
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+6
| | | | |
* | | | | imfile: converted to new ratelimit interfaceRainer Gerhards2012-10-151-15/+7
| | | | |
* | | | | ratelimit: imtcp (and gssapi) converted to new interfaceRainer Gerhards2012-10-151-4/+3
| | | | |
* | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-152-6/+12
| | | | |
* | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-154-9/+12
| | | | |
* | | | | indicate no original code left in imudpRainer Gerhards2012-10-151-2/+0
| | | | |
* | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-156-7/+6
| | | | |
* | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-152-12/+12
| | | | |
* | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-121-1/+13
| | | | |
* | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-097-10/+10
|/ / / / | | | | | | | | | | | | no actual implementation yet done
* | | | Merge branch 'beta'Rainer Gerhards2012-10-042-6/+0
|\| | |