summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-212-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | | | | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | doc: add new functions to RainerScript function listRainer Gerhards2012-09-201-1/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-193-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Free configuration objects after useMiloslav Trmač2012-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | | | | | | | | | | | | | Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-172-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
| * | | | | | | | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-145-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| * | | | | | | | | | | | | | | | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | got messed-up during merge :-(
| * | | | | | | | | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-136-80/+254
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | | | | | | | | | | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-122-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change.
| * | | | | | | | | | | | | | | | | | | Add missing prototype for tplToJSON()Rainer Gerhards2012-09-101-0/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-062-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | 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 json-c to build systemRainer Gerhards2012-08-261-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-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \