Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-09 | 1 | -1/+9 | |
|\| | | ||||||
| * | | enabled to build without libuuid, at loss of uuid functionality | Rainer Gerhards | 2012-11-09 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used. | |||||
| * | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | bugfix: property tTIMESTAMP was incorrectly restored | Rainer Gerhards | 2012-11-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | in msg deserializer | |||||
* | | | cleanup: remove no longer needed function | Rainer Gerhards | 2012-11-06 | 1 | -86/+0 | |
| | | | ||||||
* | | | queue: reduce CPU load for deserializing message properties | Rainer Gerhards | 2012-11-06 | 1 | -16/+181 | |
| | | | | | | | | | | | | | | | Linear runtime due to message order. Was quadratic before. However, not a big overall improvement. | |||||
* | | | very minimal improvement in reconstructing persisted queue entries | Rainer Gerhards | 2012-11-05 | 1 | -6/+4 | |
| | | | ||||||
* | | | queue: remove time() calls from msg deserialization | Rainer Gerhards | 2012-11-03 | 1 | -0/+13 | |
| | | | ||||||
* | | | queue: use specific deserializer for msg object | Rainer Gerhards | 2012-11-03 | 1 | -1/+2 | |
| | | | | | | | | | | | | spares lengthy table lookups | |||||
* | | | queue: remove unnecessary (obj_t*) redirection from msg ptrs | Rainer Gerhards | 2012-11-03 | 1 | -6/+3 | |
| | | | ||||||
* | | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | optimize property replacer: reduce runtime for simple processing | Rainer Gerhards | 2012-10-11 | 1 | -4/+2 | |
| | | | ||||||
* | | | fix: wrong variable was populated in MsgGetProp() | Rainer Gerhards | 2012-10-11 | 1 | -8/+8 | |
| | | | | | | | | | | | | problem in this morning's change, never released | |||||
* | | | slightly improve performance for $NOW family of system properties | Rainer Gerhards | 2012-10-11 | 1 | -17/+32 | |
| | | | ||||||
* | | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 1 | -22/+21 | |
|/ / | | | | | | | Things like $YEAR, $MONTH required a time() call each. | |||||
* | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 1 | -0/+12 | |
| | | ||||||
* | | bugfix: MsgDup() did not copy CEE structure | Rainer Gerhards | 2012-09-19 | 1 | -1/+5 | |
| | | | | | | | | | | | | This function was called at various places, most importantly during "last messages repeated n times" processing and omruleset. If CEE(JSON) data was present, it was lost as part of the copy process. | |||||
* | | clarify: NO memleak, json_object_object_del() reduces reference count | Rainer Gerhards | 2012-09-18 | 1 | -2/+0 | |
| | | | | | | | | | | json-c upstream made this clear some posts later in the discussion that I was refering to. | |||||
* | | new ruleengine: do a deep copy for "set" statement affecting JSON tree | Rainer Gerhards | 2012-09-18 | 1 | -1/+50 | |
| | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree. | |||||
* | | new ruleengine: implement native JSON in RainerScript | Rainer Gerhards | 2012-09-18 | 1 | -0/+3 | |
| | | ||||||
* | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 1 | -9/+36 | |
| | | ||||||
* | | new ruleengine: couple of fixes to new code | Rainer Gerhards | 2012-09-17 | 1 | -4/+11 | |
| | | | | | | | | | | | | - memory leak if container was tried to replace - too early free due to invalid reference counting - performance improvement for set statement | |||||
* | | new ruleengine: Implent "unset" statement | Rainer Gerhards | 2012-09-17 | 1 | -0/+42 | |
| | | ||||||
* | | Implement set config stmt (initial version) | Rainer Gerhards | 2012-09-13 | 1 | -13/+44 | |
| | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;) | |||||
* | | bugfix: string-generating templates caused abort if CEE field could not be found | Rainer Gerhards | 2012-09-10 | 1 | -3/+8 | |
| | | ||||||
* | | bugfix: specifying json root in a template lead to abort | Rainer Gerhards | 2012-09-03 | 1 | -5/+13 | |
| | | | | | | | | Thanks to Miloslav Trmač for alerting us of this problem. | |||||
* | | fix memory leak | Rainer Gerhards | 2012-08-31 | 1 | -4/+6 | |
| | | ||||||
* | | add native json-passing to output modules using JSON API | Rainer Gerhards | 2012-08-31 | 1 | -1/+34 | |
| | | ||||||
* | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-31 | 1 | -2/+2 | |
|\| | ||||||
| * | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 1 | -2/+2 | |
| | | | | | | | | also some type cleanup and simplification | |||||
* | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-27 | 1 | -5/+70 | |
|\| | | | | | | | | | Conflicts: runtime/msg.c | |||||
| * | Merge branch 'master-uuid' | Rainer Gerhards | 2012-08-27 | 1 | -2/+67 | |
| |\ | ||||||
| | * | 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 | 1 | -2/+61 | |
| | | | ||||||
| * | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 1 | -2/+2 | |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: runtime/msg.c | |||||
| | * | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | also some cleanup | |||||
| * | | 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> | |||||
* | | milestone: libee event removed from rsyslog core. Now pure JSON. | Rainer Gerhards | 2012-08-27 | 1 | -60/+12 | |
| | | ||||||
* | | milestone: first PoC for hierarchical data inside msg | Rainer Gerhards | 2012-08-27 | 1 | -10/+168 | |
|/ | ||||||
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -0/+2 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 | |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
* | | | omelasticsearch: better debug instrumentation | Rainer Gerhards | 2012-07-09 | 1 | -2/+0 | |
| | | | ||||||
* | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | 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. | |||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+13 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting |