summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | move cJSON to omelasticsearchRainer Gerhards2012-10-2911-2/+1224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the rsyslog runtime itself now uses json-c, but omelasticsearch currently depends on cJSON. We will change this, but not yet. Let's merge as is and see that it works well ;)
* | | | | | | | | | | | | | | Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-292-46/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | | | | | | | | | | | | omelasticsearch: improved debug loggingRainer Gerhards2012-07-301-2/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | omelasticsearch: support for writing data errors to local file addedRainer Gerhards2012-07-302-14/+112
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | omelasticsearch: mileston: bulk reply is parsedRainer Gerhards2012-07-301-2/+48
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | omelasticsearch: parse JSON response (in regard to data errors)Rainer Gerhards2012-07-251-37/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: bulkmode response processing is still mostly missing
* | | | | | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-241-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-241-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | | | | | | | | | | | | | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge for action list functionality will follow soon
* | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-221-0/+4
|\| | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
* | | | | | | | | | | | | | 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
| * | | | | | | | 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.
* | | | | | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 11:52:28 +0000