26 Commits

Author SHA1 Message Date
Rainer Gerhards
8314c3f016 Merge branch 'v7-stable' 2013-03-20 11:04:11 +01:00
Rainer Gerhards
5b76d63965 bugfix: $mmnormalizeuseramsg paramter was specified with wrong type
Thanks to Renzhong Zhang for alerting us of the problem.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420
2013-03-20 11:03:41 +01:00
Rainer Gerhards
7df68798be bugfix[minor]: invalid error code when mmnormalize could not access rulebase 2012-11-30 09:59:02 +01:00
Rainer Gerhards
60217da396 bugfix: mmnormalize could abort rsyslog if config parameter was in error 2012-11-28 15:12:56 +01:00
Rainer Gerhards
e581c3d26e Merge branch 'v7-stable'
Conflicts:
	doc/imptcp.html
	plugins/mmjsonparse/mmjsonparse.c
	plugins/mmnormalize/mmnormalize.c
2012-11-28 10:19:29 +01:00
Rainer Gerhards
d9df6e9775 bugfix: modules not (yet) supporting new conf format were not properly registered
This lead to a "module not found" error message instead of
the to-be-expected "module does not support new style" error message.
That invalid error message could be quite misleading and actually stop
people from addressing the real problem (aka "go nuts" ;))
2012-11-28 10:02:08 +01:00
Rainer Gerhards
aaeb1945a7 bugfix: mmnormalize build problems 2012-11-27 16:47:49 +01:00
Rainer Gerhards
d18b0a62f8 Merge branch 'v7-stable' 2012-11-01 19:04:37 +01:00
Rainer Gerhards
d5c033ac2b Merge branch 'v6-stable' into v7-stable 2012-11-01 19:04:19 +01:00
Rainer Gerhards
b6e41c0d9e bugfix: misaddressing of $mmnormalizeuserawmsg parameter
On many platforms, this has no effect at all. At some, it may cause
a segfault. The problem occurs only during config phase, no segfault
happens when rsyslog has fully started.
2012-11-01 19:03:52 +01:00
Rainer Gerhards
19354af62c mmnormalize: support for v6+ config interface added 2012-11-01 18:12:26 +01:00
Rainer Gerhards
3505de7263 mmnormalize: switched to new JSON system
Warning: so far untested
2012-08-27 16:00:04 +02:00
Rainer Gerhards
66ab2a70e5 added message property parsesuccess to indicate status of higher level 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)
2012-03-15 17:25:26 +01:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c
2012-01-19 13:07:46 +01:00
Rainer Gerhards
b38dd53e08 undoing v6.1 config scoping interface, part II (now finished)
This concludes the removal of the new scoping interface, at least as
far as pre v6-plugins are affected. Full code cleanup will happen
in the v6.3 branch.
2012-01-19 12:33:12 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
bbe1f2688c renaming conf.* wasn't a good idea -- undoing
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741 renamed conf.c to legacyconf.c to make room for new config system 2011-04-19 07:53:23 +02:00
Rainer Gerhards
209ab60f85 added log classification capabilities (via mmnormalize & tags) 2011-04-13 14:21:18 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
2011-03-11 10:24:58 +01:00
Rainer Gerhards
a072dac363 Merge branch 'lognorm' + some doc added
Conflicts:
	ChangeLog
2010-12-13 11:03:45 +01:00
Rainer Gerhards
48877c8ef4 milestone: added support for CEE-properties in property-based filters 2010-12-01 17:28:36 +01:00
Rainer Gerhards
471f07f45a milestone: template supports CEE output via %$!all-json% 2010-12-01 10:19:50 +01:00
Rainer Gerhards
cbfa21f823 mmnormalize loads & runs (basic testing done) 2010-12-01 09:37:13 +01:00
Rainer Gerhards
b9d3cdceab milestone: added mmnormalize (compiles, but untested) 2010-12-01 08:46:20 +01:00