summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for optional JSON fieldsHEADommongodbMiloslav Trmač2012-08-284-0/+18
| | | | | | | | These fields are only relevant in field templates (i.e. mongodb): a field for a non-existent CEE property is not created (instead of being set to an empty string). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Handle $!all-json in field templatesMiloslav Trmač2012-08-283-28/+97
| | | | | | | | | | | Let msg.c handle appending fields, which also allows it to append more than one field per replaced property. The result allows supplementing CEE data with other (non-constant) properties, but will currently result in duplicates if $!all-json and the template contain fields with the same names. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Send fields specified by a template to mongodb.Miloslav Trmač2012-08-282-20/+24
| | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Implement ACT_FIELDS_PASSING, test in mongodbMiloslav Trmač2012-08-285-7/+166
| | | | | | | | | | | | | | The mongodb test contains only debug printfs. Example template, inspired by writeMongoDB_msg: $template MongoTemplate,"%hostname::::sys%%timereported::::time%%timegenerated::::time_rcvd%%msg%%syslogfacility-text::::syslog_fac%%syslogseverity-text::::syslog_server%%syslogtag::::syslog_tag%%programname::::procid%%procid::::pid%%$!foo::::foo%%$!abc::::renamed%" Note that JSON escaping is actually undesirable in this mode (should it be silently ignored?), $!all-json doesn't yet work as expected, and all data is stored as strings. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Add OMSR_TPL_AS_FIELDS mode for output modules.Miloslav Trmač2012-08-285-5/+16
| | | | | | This does not yet do anything. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* 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>
| * | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | 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 printing of some template optionsMiloslav Trmač2012-08-261-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
| | | |
* | | | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | 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>
* | | | Silence compiler warnings about unused parameters.Miloslav Trmač2012-08-261-0/+3
| |_|/ |/| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-2523-110/+239
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
| | |\ | | | | | | | | | | | | | | | | Conflicts: template.c
| | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
| | * | preparing for 5.10.0 releaseRainer Gerhards2012-08-224-4/+11
| | | |
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * preparing for 5.8.13 releaseRainer Gerhards2012-08-223-3/+3
| | | |
| | | * nit: forward-compatible default ruleset name as used in next versionRainer Gerhards2012-08-221-1/+1
| | | |
| | * | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2
| | | | | | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this.
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-226-18/+119
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| | * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
| | | | | | | | | | | | | | | | This is done to prevent name claches with libraries.
| * | | Merge branch 'beta' into v6-stableRainer Gerhards2012-08-20211-11720/+15449
| |\ \ \
| | * | | nitfix: status indication (now: stable) was invalid in ChangeLogRainer Gerhards2012-08-201-1/+1
| | | | |
| | * | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-203-3/+61
| | |\ \ \ | | | | |/ | | | |/|
| | | * | nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| | | | |
| | | * | more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| | | | |
| | | * | undo last queue patch - caused a regressionRainer Gerhards2012-08-012-5/+1
| | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided
| | | * | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| | | * | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| | | | |
| | * | | preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
| | | | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-07-243-9/+10
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>