summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* new ruleengine: PROP and PRI legacy filter structures properly createdRainer Gerhards2012-09-047-100/+155
|
* new ruleengine: skeleton for reading conf file in placeRainer Gerhards2012-09-045-37/+46
| | | | code still does not work, actual functions not implemented
* new ruleengine: script block correctly builtRainer Gerhards2012-09-044-47/+83
|
* Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-044-38/+48
|\
| * Fix reference countingMiloslav Trmač2012-09-041-1/+1
| | | | | | | | | | | | | | When adding a JSON object to the template output, make sure to increment its reference count. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * Don't leak configuration value arraysMiloslav Trmač2012-09-041-0/+4
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * Don't leak property nameMiloslav Trmač2012-09-041-1/+3
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * Free configuration objects after useMiloslav Trmač2012-09-041-1/+2
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * 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>
| * Fix a memory leak in "outname"Miloslav Trmač2012-09-041-1/+1
| | | | | | | | | | | | In all cases, the variable already contains a newly allocated copy. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * Free a temporary object for the "name" propertyMiloslav Trmač2012-09-041-2/+5
| | | | | | | | | | | | | | | | | | Fixes a memory leak. Another option is to use cstrConstructFromESStr, but that would change semantics of NUL handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * Set value of a mandatory JSON field to nullMiloslav Trmač2012-09-041-6/+1
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * bugfix: specifying json root in a template lead to abortRainer Gerhards2012-09-031-5/+13
| | | | | | | | Thanks to Miloslav Trmač for alerting us of this problem.
* | new ruleengine: add &-operator (legacy action list)Rainer Gerhards2012-09-043-7/+11
| |
* | new ruleengine: first code for stmt handlingRainer Gerhards2012-09-044-21/+110
| |
* | new ruleengine: first shot at grammarRainer Gerhards2012-09-032-15/+27
|/
* fix memory leakRainer Gerhards2012-08-311-4/+6
|
* add native json-passing to output modules using JSON APIRainer Gerhards2012-08-313-11/+66
|
* Merge branch 'master' into v7-develRainer Gerhards2012-08-314-32/+63
|\
| * switch field default to "mandatory" and implement that modeRainer Gerhards2012-08-303-14/+19
| |
| * add capability to specify "optional" attribute for list-type templates, tooRainer Gerhards2012-08-291-0/+5
| |
| * Add support for optional fieldsMiloslav Trmač2012-08-293-0/+10
| |
| * default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-294-31/+42
| | | | | | | | also some type cleanup and simplification
* | Merge branch 'master' into v7-develRainer Gerhards2012-08-2917-85/+700
|\|
| * milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-292-15/+10
| |
| * adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-294-50/+27
| | | | | | | | | | 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-293-12/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * implement ACT_JSON_PASSINGRainer Gerhards2012-08-292-12/+56
| | | | | | | | | | NOTE: this is only compile-tested! For real testing, a module using that mode is required. Will be done as next steps.
| * Merge branch 'master-jsonc' into master-jsonpassingRainer Gerhards2012-08-291-2/+5
| |\
| * | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-295-5/+19
| | | | | | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on.
| * | bugfix: imtcp could abort on exit due to invalid free()Rainer Gerhards2012-08-282-1/+3
| | |
| * | preparing for 6.5.0 releasev6.5.0Rainer Gerhards2012-08-282-2/+3
| | |
| * | doc: new template system, some more output modulesRainer Gerhards2012-08-284-21/+434
| | | | | | | | | | | | added base doc for new config language
* | | Merge branch 'master' into v7-develRainer Gerhards2012-08-2714-21/+798
|\| | | | | | | | | | | | | | Conflicts: runtime/msg.c
| * | Merge branch 'master-uuid'Rainer Gerhards2012-08-276-4/+89
| |\ \
| | * | made new uuid property threadsafeRainer Gerhards2012-08-262-15/+25
| | | |
| | * | add uuid property to message objectJérôme Renard2012-08-265-4/+79
| | | |
| * | | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-278-15/+695
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: runtime/msg.c
| | * | add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-254-22/+15
| | | | | | | | | | | | | | | | also some cleanup
| | * | milestone: LIST-type templates support full option setRainer Gerhards2012-08-252-5/+77
| | | |
| | * | milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
| | | |
| | * | milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-254-13/+291
| | | |
| | * | milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-255-18/+106
| | | |
| | * | Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2523-109/+238
| | |\ \
| | * | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-253-3/+180
| | | | |
| | * | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-244-2/+33
| | | | |
| * | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-262-1/+13
| |\ \ \ \
| | * | | | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| | | | | |