Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imklog, impstats: support for new rate-limiting API added | Rainer Gerhards | 2012-10-19 | 2 | -6/+5 |
| | |||||
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 8 | -28/+30 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | | | * | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | |\| | | |||||
| | | * | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-10-18 | 1 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each. | ||||
| * | | | | | imklog: add paramter "keepkerneltimestamp" | Rainer Gerhards | 2012-10-17 | 3 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on. | ||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | | * | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | | | | | | omruleset: update to new message submit APIs/ratelimiter | Rainer Gerhards | 2012-10-18 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with the notable exception, that this module actualy needs no rate-limiter by design! | ||||
* | | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -7/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | | * | | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -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 Bartos | 2012-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
| | * | | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -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 added | Rainer Gerhards | 2012-10-15 | 1 | -1/+12 |
| | | | | | | |||||
* | | | | | | imdiag: add support for new (ratelimiting) msg submit interface | Rainer Gerhards | 2012-10-15 | 1 | -3/+7 |
| | | | | | | |||||
* | | | | | | cosmetic: remove compiler warning | Rainer Gerhards | 2012-10-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -2/+14 |
| | | | | | | |||||
* | | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+11 |
| | | | | | | |||||
* | | | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 4 | -97/+24 |
| | | | | | | |||||
* | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interface | Rainer Gerhards | 2012-10-15 | 1 | -30/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 2 | -1/+7 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -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 Gerhards | 2012-10-11 | 1 | -0/+6 |
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | imfile: converted to new ratelimit interface | Rainer Gerhards | 2012-10-15 | 1 | -15/+7 |
| | | | | | |||||
* | | | | | ratelimit: imtcp (and gssapi) converted to new interface | Rainer Gerhards | 2012-10-15 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 2 | -6/+12 |
| | | | | | |||||
* | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 4 | -9/+12 |
| | | | | | |||||
* | | | | | indicate no original code left in imudp | Rainer Gerhards | 2012-10-15 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 6 | -7/+6 |
| | | | | | |||||
* | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 2 | -12/+12 |
| | | | | | |||||
* | | | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 1 | -1/+13 |
| | | | | | |||||
* | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 7 | -10/+10 |
|/ / / / | | | | | | | | | | | | | no actual implementation yet done | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-04 | 2 | -6/+0 |
|\| | | |