| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
also some cleanup
|
| |
|
| |
|
| |
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
runtime/ruleset.c
template.h
threads.c
tools/syslogd.c
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
template.c
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
see template.c file header for details
Note that this functionality was almost never used in practice
|
| | | |\ \ |
|
| | | | |/ |
|
|/ / / / |
|
|/ / /
| | |
| | |
| | | |
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
|
|\ \ \ |
|
| | | | |
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | | |
bugfix: property replacer option "json" could lead to content loss
message was truncated if escaping was necessary
|
| | |
| | |
| | |
| | | |
timestamp
|
| | | |
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.ac
doc/manual.html
doc/rsyslog_conf.html
runtime/msg.c
runtime/rsyslog.h
template.c
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| | |
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=243
|
| |
| |
| |
| | |
needs testig and verification (wrong system for doing that ;))
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
runtime/glbl.c
|
| |
| |
| |
| |
| |
| | |
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!)
|
| | |
|
|/ |
|
|
|
|
|
| |
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206
Thanks to David Hill for alerting us.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
and a first built-in strgen module. Some tweaks and more default strgens
are needed, but the code doesn't look too bad ;)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
primarily to ease migration from syslog-ng. See property replacer doc
for details.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
template.c
tests/Makefile.am
tests/parsertest.sh
|
| | |
|
|\| |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|