summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* move cJSON to omelasticsearchRainer Gerhards2012-10-2911-2/+1224
* Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-292-46/+221
|\
| * 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
* | 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
* | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
* | | Merge branch 'beta'Rainer Gerhards2012-10-221-0/+4
|\| |
| * | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
* | | 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
| | |\ \
| | | * | 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
|\| | | |
| * | | | 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
|\| | | |
| * | | | 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
* | | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-173-13/+18
* | | | | | 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
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | 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
|\| | | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
| |\| | | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| | |\| | |
| | | * | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | | * | | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
| | * | | | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-1/+1
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-1/+1
|\| | | | |
| * | | | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+6
|\| | | | | | |_|_|/ / |/| | | |
| * | | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+6
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-042-6/+0
|\| | | |
| * | | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-6/+0
| |\| | |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-6/+0
| | |\| |
| | | * | remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-6/+0
* | | | | omlibdbi improvementsRainer Gerhards2012-10-041-26/+125
|/ / / /
* | | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
* | | | cleanupRainer Gerhards2012-10-021-3/+0
* | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-10/+10
* | | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
* | | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-4/+20