| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for optional JSON fieldsHEADommongodb | Miloslav Trmač | 2012-08-28 | 4 | -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 templates | Miloslav Trmač | 2012-08-28 | 3 | -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-28 | 2 | -20/+24 |
| | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| * | Implement ACT_FIELDS_PASSING, test in mongodb | Miloslav Trmač | 2012-08-28 | 5 | -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-28 | 5 | -5/+16 |
| | | | | | | | This does not yet do anything. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| * | Merge branch 'master-uuid' | Rainer Gerhards | 2012-08-27 | 6 | -4/+89 |
| |\ | |||||
| | * | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 2 | -15/+25 |
| | | | |||||
| | * | add uuid property to message object | Jérôme Renard | 2012-08-26 | 5 | -4/+79 |
| | | | |||||
| * | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 8 | -15/+695 |
| |\ \ | |/ |/| | | | | | Conflicts: runtime/msg.c | ||||
| | * | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 4 | -22/+15 |
| | | | | | | | | | also some cleanup | ||||
| | * | milestone: LIST-type templates support full option set | Rainer Gerhards | 2012-08-25 | 2 | -5/+77 |
| | | | |||||
| | * | milestone: LIST-type template now only missing regex support | Rainer Gerhards | 2012-08-25 | 1 | -0/+41 |
| | | | |||||
| | * | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 4 | -13/+291 |
| | | | |||||
| | * | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 5 | -18/+106 |
| | | | |||||
| | * | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 23 | -109/+238 |
| | |\ | |||||
| | * | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 3 | -3/+180 |
| | | | | |||||
| | * | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 4 | -2/+33 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 2 | -1/+13 |
| |\ \ \ | |||||
| | * | | | doc: add incompatible patch info to ChangeLog | Rainer Gerhards | 2012-08-26 | 1 | -0/+12 |
| | | | | | |||||
| | * | | | INCOMPATIBLE: Return {} for missing $!all-json | Miloslav Trmač | 2012-08-26 | 1 | -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 jsonf | Miloslav Trmač | 2012-08-26 | 2 | -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-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| | * | | | Fix printing of some template options | Miloslav Trmač | 2012-08-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| | * | | | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 2 | -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-26 | 1 | -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-26 | 1 | -0/+3 |
| | |_|/ |/| | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| * | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 23 | -110/+239 |
| |\| | | |/ |/| | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 21 | -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-stable | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice | ||||
| | | * | | preparing for 5.10.0 release | Rainer Gerhards | 2012-08-22 | 4 | -4/+11 |
| | | | | | |||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -2/+6 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | | * | preparing for 5.8.13 release | Rainer Gerhards | 2012-08-22 | 3 | -3/+3 |
| | | | | | |||||
| | | | * | nit: forward-compatible default ruleset name as used in next version | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | small bugfix: stream timeout API use was incorrect | Rainer Gerhards | 2012-08-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this. | ||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 6 | -18/+119 |
| | | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 3 | -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/RSFALSE | Rainer Gerhards | 2012-08-22 | 14 | -46/+45 |
| | | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | * | | | Merge branch 'beta' into v6-stable | Rainer Gerhards | 2012-08-20 | 211 | -11720/+15449 |
| | |\ \ \ | |||||
| | | * | | | nitfix: status indication (now: stable) was invalid in ChangeLog | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 3 | -3/+61 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | nitfix: remove quirck in new debug message code | Rainer Gerhards | 2012-08-01 | 1 | -4/+2 |
| | | | | | | |||||
| | | | * | | more elaborate debug logging for object deserializer | Rainer Gerhards | 2012-08-01 | 1 | -0/+39 |
| | | | | | | |||||
| | | | * | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 2 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | ||||
| | | | * | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 2 | -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 Lorbach | 2012-07-31 | 2 | -1/+5 |
| | | | | | | |||||
| | | * | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 3 | -3/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | | Fix printing of some template options | Miloslav Trmač | 2012-08-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |