summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
| | | | | | | | | | | | | | | | ... in order to keep in line with current lumberjack schema
* | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add missing error handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the return value to signal errors instead of overloading *lenProp == 0. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | 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
| | | | | | | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development
| * | | Add template support: parse text, convert to BSONMiloslav Trmač2012-08-292-8/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a json-c library (http://oss.metaparadigm.com/json-c/). With this, a template > $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" and action > & action(type="ommongodb" db="ceelog" collection="local" template="MongoTemplate") will store a record created by > logger -d -u p/dev/log -p mail.info -t mymailer '@cee: {"false": false, "null": null, "true": true, "object": {"a":"a", "b":"b"}, "array": [1, 2, 3], "number1": 3, "number2": 3.14, "string": "String"}' as > { "_id" : ObjectId("5037bbfc97dd811374ce5a00"), "sys" : "kulicka", "false" : "false", "null" : "-", "true" : "true", "object.a" : "a", "object.b" : "b", "array.*" : "3", "number1" : "3", "number2" : "3.140000", "string" : "String" } which is not great, but fair enough given the current design of libee (the information loss manifests by the time of template processing, ommongodb can't fix it). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | Split MongoDB output into BSON creation and MongoDB interactionMiloslav Trmač2012-08-291-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to add template processing more cleanly. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | 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
| | | | | | | | | | | | | | | | Warning: only minimal testing done so far
* | | | minor cleanupRainer Gerhards2012-08-271-14/+0
| | | |
* | | | mmnormalize: switched to new JSON systemRainer Gerhards2012-08-271-12/+24
| | | | | | | | | | | | | | | | Warning: so far untested
* | | | mmauditparse: change to support new json-based systemRainer Gerhards2012-08-271-53/+22
| | | | | | | | | | | | | | | | Warning: received only extremely minimal testing
* | | | 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
| | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Silence compiler warnings about unused parameters.Miloslav Trmač2012-08-261-0/+3
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-253-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-253-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-223-7/+7
| | | | | | | | | | | | This is done to prevent name claches with libraries.
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-13/+2
| | |\
* | | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
| | | | | | | | | | | | | | | | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off)
* | | | 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 ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | imzmq3: Added the return call to runInputDavid Kelly2012-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | Just to be sure that nothing unfortunate would happen, possible that housekeeping would not get done without this.
* | | | BAT-40 Found leak in imzmq3 pluginDavid Kelly2012-07-311-1/+4
| | | | | | | | | | | | | | | | | | | | For some reason I forgot to free() the buffer that comes back from zstr_recv(). Doh!
* | | | Merge branch 'beta'Rainer Gerhards2012-07-243-50/+196
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | 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
| | | | | | | | | | | | | | | | this was not present in any released version
| * | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-112-2/+2
| | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
| * | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-48/+374
| |\ \ \
| | * | | omelasticsearch: bugfix: bulkmode setting was not properly initializedRainer Gerhards2012-06-131-0/+1
| | | | |
| | * | | omelasticsearch: dyn index&type now also supported in bulk modeRainer Gerhards2012-05-281-4/+7
| | | | |
| | * | | omelasticsearc: milestone, bulk insert basically worksRainer Gerhards2012-05-251-50/+65
| | | | | | | | | | | | | | | | | | | | | | | | | dynamic index&type is not yet used, but easy to add (did not manage to get it in today...)
| | * | | omelasticsearch: test commit, first shot at bulk interfaceRainer Gerhards2012-05-251-11/+85
| | | | | | | | | | | | | | | | | | | | | | | | | This obviously does not work correctly. So expect problems if you set bulkmode="on".
| | * | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-241-1/+36
| | | | |
| | * | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+28
| | | | |
| | * | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-239-25/+56
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| | * | | | omelasticsearch: added asnycRepl and timeout config paramsRainer Gerhards2012-04-161-3/+26
| | | | | |