summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| |
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
| |\ | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
| * | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
| * | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| | |
| | * 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
| | |
* | | 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
| * | preparing for 6.4.1 releasev6.4.1Rainer Gerhards2012-09-064-7/+9
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
|\| |
| * | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
| | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
| * | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* | | 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| | | | | |
| * | | | | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %$!all-json% will return a {}-wrapped object if there are are any events, or when there is an attached (empty) pMsg->event, but an empty string if nothing is attached. Let it return an empty object "{}" in that case for consistency. In particular, this allows $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" to always result in a valid JSON. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 12:23:10 +0000