summaryrefslogtreecommitdiffstats
path: root/template.c
Commit message (Collapse)AuthorAgeFilesLines
* Add support for optional JSON fieldsHEADommongodbMiloslav Trmač2012-08-281-0/+5
| | | | | | | | 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 templatesMiloslav Trmač2012-08-281-28/+16
| | | | | | | | | | | 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>
* Implement ACT_FIELDS_PASSING, test in mongodbMiloslav Trmač2012-08-281-0/+59
| | | | | | | | | | | | | | 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 capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-13/+8
| | | | also some cleanup
* milestone: LIST-type templates support full option setRainer Gerhards2012-08-251-0/+72
|
* milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
|
* milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-2/+264
|
* milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-11/+33
|
* Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-251-14/+23
|\
| * Merge branch 'v6-stable'Rainer Gerhards2012-08-251-15/+24
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-15/+24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-15/+24
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| | | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-251-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
| | | * | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-271-8/+29
| | | |\ \
| | | | * | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-8/+29
| | | | |/
* | | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-1/+177
|/ / / /
* | | | Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
|/ / / | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-261-8/+29
|\ \ \
| * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-8/+29
| | | |
* | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-231-2/+1
|/ / /
* | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-18/+55
| | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-291-0/+5
| | | | | | | | | | | | timestamp
* | | added "json" property replacer optionRainer Gerhards2012-03-161-1/+16
| | |
* | | cleanup: different text escape types made more portableRainer Gerhards2012-01-191-10/+0
| | |
* | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-32/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * | add JSON escaping optionNathan Scott2012-01-171-33/+57
| |/ | | | | | | | | | | | | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com>
* | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-7/+0
| |
* | milestone: templates are now in config objectRainer Gerhards2011-04-191-23/+27
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-9/+32
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * Merge branch 'v5-beta-strgen-bind' into v5-betaRainer Gerhards2011-03-291-2/+2
| |\
| | * bugfix: strgen could not be used together with database outputsRainer Gerhards2011-03-211-2/+2
| | | | | | | | | | | | | | | | | | because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195
| * | bugfix: rsyslog did not build with --disable-regexp configure optionRainer Gerhards2011-03-281-3/+9
| |/ | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=243
| * potential fix to issue that strgen's do not support SQL optionRainer Gerhards2011-03-211-6/+23
| | | | | | | | needs testig and verification (wrong system for doing that ;))
* | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-6/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-6/+4
| | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | milestone: added support for CEE-properties in property-based filtersRainer Gerhards2010-12-011-2/+4
| |
* | milestone: template supports CEE output via %$!all-json%Rainer Gerhards2010-12-011-1/+17
|/
* bugfix: segfault when an *empty* template was usedRainer Gerhards2010-11-051-2/+10
| | | | | Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206 Thanks to David Hill for alerting us.
* finshed implementation of strgen modulesRainer Gerhards2010-06-041-8/+15
| | | | | | and also provided four build-in modules for the most common use cases, hopefully resulting in a speedup of around 5% for typical rsyslog processing.
* first implementation of strgen interfaceRainer Gerhards2010-06-011-57/+13
| | | | | and a first built-in strgen module. Some tweaks and more default strgens are needed, but the code doesn't look too bad ;)
* experimental commit: facility to generate template via C functionRainer Gerhards2010-06-011-5/+97
| | | | | | | | | | | | | | This was a test done to try to generate templates with C code, via a new (potentially to-be-implemented) class of template modules. We have a rough POC inside this code, and it showed around 5% or better speedup. So it semms worth continuing in this direction. Note that this experimental commit works correct, but does any template in the form of $template tpl,=somewhat will lead to fixed template expansion based on the default file format.
* some cleanupRainer Gerhards2010-04-191-1/+0
|
* added new property replacer option "date-rfc3164-buggyday"Rainer Gerhards2010-03-051-0/+2
| | | | | primarily to ease migration from syslog-ng. See property replacer doc for details.
* Merge branch 'v4-beta' into betaRainer Gerhards2010-02-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
| * fixed a small memory leak during config file parsingRainer Gerhards2010-02-091-1/+4
| |
* | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-041-4/+1
|\ \ | |/
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-041-4/+1
| |\
| | * bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-041-4/+1
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | bugfix: message could be truncated after TAG, often when forwardingRainer Gerhards2009-07-091-2/+4
| | | | | | | | | | | | | | | | | | This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. Also did some testbench improvements, including omstdout.
* | | some cleanup (removal of debug code)Rainer Gerhards2009-10-301-4/+0
| | |