summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* somewhat better debug outputRainer Gerhards2012-09-282-2/+6
|
* Merge branch 'v6-devel'Rainer Gerhards2012-09-283-46/+205
|\
| * imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| |
| * imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| |
| * fix whitespace issueRainer Gerhards2012-09-271-1/+0
| |
* | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-207/+908
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * 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 'v6-devel'Rainer Gerhards2012-09-261-0/+7
|\ \ \
| * \ \ Merge branch 'v6-stable' into v6-develRainer 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.
* | | | Handle JSON value "null" instead of crashingMiloslav Trmač2012-09-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Future json-c versions will handle this transparently, for now we have to do it manually. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Remove unnecessary config options in imkmsgMilan Bartos2012-09-242-87/+2
| | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/imkmsg.c modified: plugins/imkmsg/kmsg.c
* | | | Made imkmsg parse the messages instead of creating string to be parsed later.Milan Bartos2012-09-243-76/+45
| | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c
* | | | Modified comments.Milan Bartos2012-09-243-40/+21
| | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c
* | | | Added new module, imkmsg, for structured kernel logs from /dev/kmsg.Milan Bartos2012-09-244-0/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still in development, bute ready to be commited to master. modified: Makefile.am modified: configure.ac new file: plugins/imkmsg/Makefile.am new file: plugins/imkmsg/imkmsg.c new file: plugins/imkmsg/imkmsg.h new file: plugins/imkmsg/kmsg.c
* | | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail.
* | | | preparing for 7.1.4 releasev7.1.4Rainer Gerhards2012-09-192-5/+5
| | | |
* | | | new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-181-5/+5
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-121-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | | 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 '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
| | | | | | | | | | | | | | | | | | | | | | | | 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>