rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	provide support to dynamically enable/disable legacy conf command	Rainer Gerhards	2012-06-26	1	-10/+9
\| \| \| \|	most important to prevent clashes with new style settings
*	imudp: support for module() global config parameters added	Rainer Gerhards	2012-06-26	1	-3/+2
\|
*	impstats: support for module() global config parameters added	Rainer Gerhards	2012-06-26	1	-25/+103
\|
*	added new-style zeromq plugins, based on czmq api and rsyslog v6 conf	David Kelly	2012-05-29	1	-1/+10
\|
*	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	1	-7/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
\| *	milestone: added capability to use a local interface IP address as fromhost-ip	Rainer Gerhards	2012-03-21	1	-7/+1
\| \| \| \| \| \| \| \| \| \|	... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
* \|	impstats: added $PStatsJSON directive	Rainer Gerhards	2012-04-01	1	-1/+6
\| \|
* \|	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	undoing v6.1 config scoping interface, part II (now finished)	Rainer Gerhards	2012-01-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-14	1	-24/+14
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
* \| \|	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	1	-24/+14
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
\| * \|	relicense to ASL 2.0	Rainer Gerhards	2012-01-11	1	-24/+14
\| \| \|
* \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-19	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c plugins/imudp/imudp.c
\| * \| \|	new stats counter "discarded" for queue object	Rainer Gerhards	2011-12-16	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Tells how many messages have been discarded due to queue full condition.
* \| \|	milestone: added module config names	Rainer Gerhards	2011-07-20	1	-0/+1
\| \| \|
* \| \|	move impstats to new config interface	Rainer Gerhards	2011-05-20	1	-14/+32
\| \| \|
* \| \|	step: imtcp moved to new config interface	Rainer Gerhards	2011-05-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	as far as we know that new interface right now ;)
* \| \|	step: put plumbing in place for new input module config system	Rainer Gerhards	2011-05-03	1	-0/+30
\| \|/ \|/\|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-04-15	1	-0/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: plugins/impstats/impstats.c
\| *	bugfix: doc for impstats had wrong config statements	Rainer Gerhards	2011-04-14	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem.
* \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-03-11	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
\| *	fixed small regression from gnutls fd leak fix	Rainer Gerhards	2011-03-06	1	-0/+1
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-05	1	-4/+4
\|/ \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
*	improved statistics-gathering subsystem	Rainer Gerhards	2010-09-13	1	-12/+27
\| \| \| \| \| \| \| \|	... well, actually this is a first real implementation of this subsystem. I have added a counter registry, a way to access the countres (as readable string) and a way to define and maintem them. Also, module impstats has been updated to utilize the new system. Finally, I added some counters. I hope that this sets the baseline for useful future enhancements.
*	fixed small memory leak, corrected input name	Rainer Gerhards	2010-09-09	1	-1/+3
\|
*	added module impstat to emit periodic statistics on rsyslog counters	Rainer Gerhards	2010-09-09	2	-0/+217
	This is a very first and very rough and very featureless first shot at this functionality. It is assumed that we will enhance the stats system as a by-line while doing other development.