Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add support for optional JSON fieldsHEADommongodb | Miloslav Trmač | 2012-08-28 | 1 | -0/+8 |
| | | | | | | | | 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 | 2 | -0/+81 |
| | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | Implement ACT_FIELDS_PASSING, test in mongodb | Miloslav Trmač | 2012-08-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | 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 | 2 | -4/+6 |
| | | | | | | This does not yet do anything. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | Merge branch 'master-uuid' | Rainer Gerhards | 2012-08-27 | 3 | -3/+69 |
|\ | |||||
| * | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 1 | -15/+21 |
| | | |||||
| * | add uuid property to message object | Jérôme Renard | 2012-08-26 | 3 | -3/+63 |
| | | |||||
* | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 2 | -3/+15 |
|\ \ | |/ |/| | | | | | Conflicts: runtime/msg.c | ||||
| * | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | | | | | | also some cleanup | ||||
| * | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -5/+6 |
| | | |||||
| * | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 |
| |\ | |||||
| * | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | |||||
| * | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 1 | -0/+10 |
| | | | |||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | | | | | | | | | | 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> | ||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 |
|\| | | |/ |/| | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 9 | -34/+34 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice | ||||
| | | * | 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 | 4 | -14/+50 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -27/+26 |
| | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -0/+37 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | ||||
| | * | | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 3 | -2/+50 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 2 | -9/+9 |
| |\| | | | |||||
| * | | | | omelasticsearch: better debug instrumentation | Rainer Gerhards | 2012-07-09 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | debug log: cleaned up & streamlined queue param output | Rainer Gerhards | 2012-07-05 | 1 | -20/+43 |
| | | | | | |||||
| * | | | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 2 | -0/+27 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2012-07-24 | 2 | -9/+9 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | bugfix: strm class could abort under some circumstances | Rainer Gerhards | 2012-07-24 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault. | ||||
| * | | | | bugfix: DA queue could cause abort | Rainer Gerhards | 2012-07-24 | 1 | -3/+5 |
| | |_|/ | |/| | | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 3 | -2/+3 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 3 | -2/+3 |
| |\ \ \ | |||||
| | * | | | property replacer lost one char when json escaping was necessary | Rainer Gerhards | 2012-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost. | ||||
| | * | | | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 12 | -159/+438 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| | * | | | | permitting plugins to use three string requests | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
| | | | | | | |||||
| | * | | | | omelasticsearch: used new property replacer options for default template | Rainer Gerhards | 2012-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster) | ||||
| * | | | | | improve invalid config command error message | Rainer Gerhards | 2012-06-27 | 1 | -1/+2 |
| | | | | | |