summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-newtemplate'Rainer Gerhards2012-08-271-2/+2
|\ | | | | | | | | Conflicts: runtime/msg.c
| * add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-2/+2
| | | | | | | | also some cleanup
* | 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-261-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 'v5-stable' into v6-stableRainer Gerhards2012-08-251-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-stableRainer Gerhards2012-08-251-0/+2
| |\ | | | | | | | | | | | | Conflicts: template.c
| | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-251-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-betaRainer Gerhards2012-06-111-4/+8
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
* | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-2/+0
| | |
* | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-1/+1
|\ \ \
| * | | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost.
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-4/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-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 codeRainer Gerhards2012-06-081-0/+5
| | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-061-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-061-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-061-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | * | | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-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-betaRainer Gerhards2012-04-271-55/+57
| |\ \ \ \
| | * | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-55/+57
| | |/ / /
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-181-0/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
| * \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
| |\ \ \ \ \
* | | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-55/+57
| |_|_|_|_|/ |/| | | | |
* | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-37/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-181-0/+42
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-181-3/+21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fixed compile bugRainer Gerhards2012-04-181-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 queuesRainer Gerhards2012-04-181-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. Falco2012-04-131-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 Gerhards2012-03-291-0/+16
| | | | | | | | | | | | | | | | timestamp
* | | | added "json" property replacer optionRainer Gerhards2012-03-161-2/+110
| | | |
* | | | added message property parsesuccess to indicate status of higher level ↵Rainer Gerhards2012-03-151-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.2Rainer Gerhards2012-02-281-1/+1
| | | |
* | | | bugfix: property $!all-json made rsyslog abort if no normalized data is ↵Rainer Gerhards2012-02-211-4/+11
| | | | | | | | | | | | | | | | available
* | | | dns cache: working on invalid resolution bug, againRainer Gerhards2012-02-091-1/+2
| | | | | | | | | | | | | | | | the proposed solution did not work out well...
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-091-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-5/+5
| |\| |
| | * | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-4/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
| | |/ | |/|
* | | Merge branch 'beta'Rainer Gerhards2011-10-271-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-211-2/+2
| | | | | | | | | | | | see v6 compatibility document for reasons
* | | Merge branch 'beta'Rainer Gerhards2011-10-171-7/+45
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-7/+45
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-131-3/+21
| | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| | * bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-131-4/+24
| | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| * | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-1/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-1/+0
| | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
generated by cgit (git 2.34.1) at 2024-05-27 11:40:14 +0000