summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
|
* fix whitespace issueRainer Gerhards2012-09-271-1/+0
|
* bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-7/+2
| | | | This could lead to startup with invalid parameters.
* imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-271-9/+77
|
* yet another nitfix...Rainer Gerhards2012-09-271-1/+1
|
* nitfixRainer Gerhards2012-09-271-2/+2
|
* imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
|
* milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
|
* imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
|
* imudp: implement support for input()Rainer Gerhards2012-09-262-9/+84
|
* imptcp: implement support for input()Rainer Gerhards2012-09-262-15/+119
|
* imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
|
* Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
|
* Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-261-0/+7
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+7
| |\ | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+7
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-201-0/+0
| | |
* | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-0/+1
| | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-8/+6
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
| * | 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>
* | | 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
| | |
* | | 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
| | | |