summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-181-5/+5
* Merge branch 'v6-devel'Rainer Gerhards2012-09-121-5/+5
|\
| * Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-8/+6
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
| | |\
| | | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-1/+5
| | | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-09-111-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| * | | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
* | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
* | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
* | | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
* | | | Merge branch 'master' into v7-develRainer Gerhards2012-08-293-43/+184
|\ \ \ \ | | |_|/ | |/| |
| * | | milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-291-15/+8
| * | | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-292-47/+26
| * | | Add template support: parse text, convert to BSONMiloslav Trmač2012-08-292-8/+175
| * | | Split MongoDB output into BSON creation and MongoDB interactionMiloslav Trmač2012-08-291-24/+27
| * | | bugfix: imtcp could abort on exit due to invalid free()Rainer Gerhards2012-08-281-1/+0
* | | | imuxsock: changed to use new JSON based systemRainer Gerhards2012-08-271-48/+19
* | | | minor cleanupRainer Gerhards2012-08-271-14/+0
* | | | mmnormalize: switched to new JSON systemRainer Gerhards2012-08-271-12/+24
* | | | mmauditparse: change to support new json-based systemRainer Gerhards2012-08-271-53/+22
* | | | milestone: first PoC for hierarchical data inside msgRainer Gerhards2012-08-271-23/+54
|/ / /
* | | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
* | | Silence compiler warnings about unused parameters.Miloslav Trmač2012-08-261-0/+3
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-253-7/+7
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-253-7/+7
| |\|
| | * changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-223-7/+7
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-13/+2
| | |\
* | | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
* | | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
* | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-1/+5
|\ \ \ \
| * | | | Merge branch 'beta'Rainer Gerhards2012-08-011-1/+5
| |\| | |
| | * | | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-08-011-1/+5
* | | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / /
* | | | imzmq3: Added the return call to runInputDavid Kelly2012-07-311-0/+1
* | | | BAT-40 Found leak in imzmq3 pluginDavid Kelly2012-07-311-1/+4
* | | | Merge branch 'beta'Rainer Gerhards2012-07-243-50/+196
|\| | |
| * | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-241-1/+1
| * | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| * | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-112-2/+2
| * | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-101-20/+95
| * | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| * | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-15/+33
* | | | bugfix: omhdfs did no longer compileRainer Gerhards2012-07-111-1/+1
* | | | Merge branch 'beta'Rainer Gerhards2012-06-291-48/+374
|\| | |
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-48/+374
| |\ \ \
| | * | | omelasticsearch: bugfix: bulkmode setting was not properly initializedRainer Gerhards2012-06-131-0/+1