Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |||||
| * | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris | |||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
* | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: runtime/modules.c | |||||
| * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c | |||||
| | * | | | bugfix: property PROCID was empty instead of proper nilvalue if not present | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue. | |||||
| * | | | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 | |
| |\ \ \ \ | ||||||
| | * | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 | |
| | |/ / / | ||||||
| * | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 1 | -0/+21 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | |||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 | |
| |\ \ \ \ \ | ||||||
* | | | | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -55/+57 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -37/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary | |||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 1 | -0/+42 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h | |||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-18 | 1 | -3/+21 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -1/+1 | |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S | |||||
| | * | | | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 1 | -3/+21 | |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue. | |||||
| * | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵ | Steven A. Falco | 2012-04-13 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started. | |||||
* | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵ | Rainer Gerhards | 2012-03-29 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | timestamp | |||||
* | | | | added "json" property replacer option | Rainer Gerhards | 2012-03-16 | 1 | -2/+110 | |
| | | | | ||||||
* | | | | added message property parsesuccess to indicate status of higher level ↵ | Rainer Gerhards | 2012-03-15 | 1 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parser run added message property parsesuccess to indicate if the last run higher-level parser could successfully parse the message or not (see property replacer html doc for details) | |||||
* | | | | changes needed for libee 0.4.2 | Rainer Gerhards | 2012-02-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | bugfix: property $!all-json made rsyslog abort if no normalized data is ↵ | Rainer Gerhards | 2012-02-21 | 1 | -4/+11 | |
| | | | | | | | | | | | | | | | | available | |||||
* | | | | dns cache: working on invalid resolution bug, again | Rainer Gerhards | 2012-02-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | the proposed solution did not work out well... | |||||
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 | |
| |\| | | ||||||
| | * | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -4/+0 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c |