Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | make omruleset non-default in ./configure | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default. | |||||
| * | | | | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | prepare for 7.1.9 releasev7.1.9 | Rainer Gerhards | 2012-10-09 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.3.0 releasev7.3.0 | Rainer Gerhards | 2012-10-08 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -16/+0 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | |||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -17/+0 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -17/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | |||||
| | * | | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -0/+16 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
| * | | | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'v6-stable' into beta | Andre Lorbach | 2012-06-28 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
* | | | | | | prepare for 7.1.8 releasev7.1.8 | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 1 | -0/+13 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 1 | -0/+13 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Added new module, imkmsg, for structured kernel logs from /dev/kmsg. | Milan Bartos | 2012-09-24 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.3 releasev7.1.3 | Rainer Gerhards | 2012-09-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.2 releasev7.1.2 | Rainer Gerhards | 2012-09-12 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.1 releasev7.1.1 | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | preparing for 7.1.0v7.1.0 | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 BSON | Miloslav Trmač | 2012-08-29 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
* | | | | | Merge branch 'master-jsonc' into master-jsonpassing | Rainer Gerhards | 2012-08-29 | 1 | -2/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | add json-c to build system | Rainer Gerhards | 2012-08-26 | 1 | -2/+5 | |
| | | | | | | ||||||
* | | | | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -0/+15 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'beta' | Andre Lorbach | 2012-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'v6-stable' into beta | Charlie Root | 2012-06-28 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||||
| | * | | | Added dragonfly to configure.ac | Bartosz Kuzma | 2012-06-27 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | preparing for 6.2.2 releasev6.2.2 | Rainer Gerhards | 2012-06-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-04 | 1 | -10/+14 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10 | Rainer Gerhards | 2012-06-04 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Miloslav Trmač for providing patches and suggestions | |||||
| * | | | | preparing for 6.3.10 | Rainer Gerhards | 2012-06-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-04 | 1 | -7/+7 | |
| |\| | | | ||||||
| | * | | | bugfix: --enable-smcustbindcdr configure directive did not work | Ultrabug | 2012-06-04 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| | * | | | preparing for 6.2.1v6.2.1 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master-zmq' | Rainer Gerhards | 2012-06-01 | 1 | -0/+42 | |
|\ \ \ \ \ | ||||||
| * | | | | | added new-style zeromq plugins, based on czmq api and rsyslog v6 conf | David Kelly | 2012-05-29 | 1 | -0/+42 | |
| | | | | | | ||||||
* | | | | | | imrelp now supports non-cancel thread termination | Rainer Gerhards | 2012-05-31 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | (but now requires at least librelp 1.0.1) | |||||
* / / / / | added --enable-debugless configure option for very high demanding environments | Rainer Gerhards | 2012-05-29 | 1 | -1/+18 | |
|/ / / / | | | | | | | | | | | | | | | | | This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities) | |||||
* | | | | preparing for 6.3.9 (beta) releasev6.3.9 | Rainer Gerhards | 2012-05-22 | 1 | -1/+1 | |
| | | | |