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

	Commit message (Collapse)	Author	Age	Files	Lines
*	omelasticsearch: added transactional interface & better debug output	Rainer Gerhards	2012-05-24	1	-1/+36
\|
*	omelasticsearch: provide authentication support (UNTESTED)	Rainer Gerhards	2012-04-25	1	-0/+28
\|
*	Merge branch 'master' into master-elasticsearch	Rainer Gerhards	2012-04-23	9	-25/+56
\|\ \| \| \| \| \| \| \| \|	Conflicts: plugins/omelasticsearch/omelasticsearch.c
\| *	bugfix/imuxsock: configured hostname was not used	Rainer Gerhards	2012-04-16	1	-0/+1
\| \|
\| *	bugfix/imuxsock: solving abort if hostname was not set	Rainer Gerhards	2012-04-16	1	-2/+2
\| \|
\| *	make "old" omelasticsearch compile	Rainer Gerhards	2012-04-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \|	this module is to be replaced by branch currently in development. But I want to be able to compile the previous one, at least ;)
\| *	imuxsock: mini bugfix: closed fd was tried to close a second time	Rainer Gerhards	2012-04-13	1	-3/+6
\| \|
\| *	Merge branch 'v5-beta'	Rainer Gerhards	2012-04-12	1	-6/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
\| \| *	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-12	1	-8/+7
\| \| \|\
\| \| \| *	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-12	1	-8/+7
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
\| \| \| \| *	imuxsock: do not cache hostname	Rainer Gerhards	2012-04-12	1	-10/+4
\| \| \| \| \|
\| * \| \| \|	imuxsock: fixed regression from last merge	Rainer Gerhards	2012-04-11	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	thanks to Brian Knox for alerting me and the initial analysis
\| * \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2012-04-07	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
\| \| * \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-07	3	-56/+3
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html
\| \| * \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-20	1	-2/+13
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imptcp/imptcp.c
\| \| * \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-19	3	-3/+8
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
\| \| * \ \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-14	3	-0/+5
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| \| * \ \ \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-12	4	-8/+62
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
\| \| * \ \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-02	1	-2/+5
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-01	1	-0/+9
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-01	4	-47/+49
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
\| \| * \| \| \| \| \| \| \| \| \|	bugfix: imklog invalidly computed facility and severity	Rainer Gerhards	2012-03-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	8	-18/+43
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \|	unified use of $LocalHostIPIF among all locally-emitting inputs	Rainer Gerhards	2012-03-22	2	-49/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
\| \| * \| \| \| \| \| \| \| \| \|	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...
\| \| * \| \| \| \| \| \| \| \|	added configuration directive to disable octet-counted framing	Rainer Gerhards	2012-03-20	1	-3/+14
\| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
\| \| * \| \| \| \| \| \| \|	added configuration directive to disable octet-counted framing	Rainer Gerhards	2012-03-19	3	-3/+8
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
\| \| * \| \| \| \| \| \|	added missing initialization of stats counters	Rainer Gerhards	2012-03-14	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch!
\| \| * \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-14	1	-0/+3
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| / \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| \| * \| \| \| \| \|	added capability to use a local interface IP address as fromhost-ip for imklog	Rainer Gerhards	2012-03-10	1	-1/+26
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	imuxsock did ignore configured IP if - always used eth0 if one was set ;)	Rainer Gerhards	2012-03-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	bugfix: imudp: only two listeners were activated	Rainer Gerhards	2012-03-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	no matter how many were defined. Note that IPv4 and IPv6 count as two!
\| \| * \| \| \| \| \|	added capability to use a local interface IP address as fromhost-ip for imuxsock	Rainer Gerhards	2012-03-06	1	-5/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new config directives: $IMUXSockLocalIPIF
\| \| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-05	3	-18/+28
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| \| * \| \| \| \| \|	bugfix: imptcp stats sometimes incorrectly reported socket as IPv6	Rainer Gerhards	2012-02-20	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-01-30	3	-31/+35
\| \| \|\ \ \ \ \ \
* \| \| \| \| \| \| \| \|	omelasticsearch: added asnycRepl and timeout config params	Rainer Gerhards	2012-04-16	1	-3/+26
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	omelasticsearch: permit dynamic index/type parameters (just like dynafile)	Rainer Gerhards	2012-04-13	1	-16/+107
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	imuxsock: mini bugfix: closed fd was tried to close second time	Rainer Gerhards	2012-04-13	1	-3/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	omelasticsearch: moved to v6 config system	Rainer Gerhards	2012-04-05	1	-35/+91
\|/ / / / / / / /
* \| \| \| \| \| \| \|	impstats: added $PStatsJSON directive	Rainer Gerhards	2012-04-01	1	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	ommongodb: extended default schema	Rainer Gerhards	2012-03-30	1	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	includes more syslog-specific fields
* \| \| \| \| \| \| \|	ommongodb: now writes a real timestamp into mongo	Rainer Gerhards	2012-03-30	1	-3/+26
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	omhiredis: improved error reporting	Brian Knox	2012-03-23	1	-4/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	omhiredis: error checking changes and code cleanup	Brian Knox	2012-03-21	1	-40/+36
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	omhiredis: some more cleanup	Rainer Gerhards	2012-03-21	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- C++ comments to C comment style (some compilers need that) - removed some left-over from the copy template (was even not needed there ;))
* \| \| \| \| \| \| \|	omhiredis: some cleanup	Rainer Gerhards	2012-03-21	1	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	initial shot at omhiredis	Brian Knox	2012-03-21	5	-0/+1124
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	ommongodb: working on error reporting	Rainer Gerhards	2012-03-20	1	-5/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	ommongodb: basic error reporting	Rainer Gerhards	2012-03-20	2	-6/+25
\| \| \| \| \| \| \| \|