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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-05-03	1	-1/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	ommysql: added support for new mysql_library_[init/exit]	Rainer Gerhards	2012-05-03	1	-1/+11
\| \|
\| *	bugfix: ommysql did not properly init/exit the mysql runtime library	Rainer Gerhards	2012-05-03	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
\| *	bugfix: imptcp input name could not be set	Rainer Gerhards	2012-04-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	bugfix: imptcp input name could not be set config directive was accepted, but had no effect
* \|	Merge branch 'v5-stable-newstats' into v5-beta	Rainer Gerhards	2012-04-19	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \|	bugfix: imptcp input name could not be set	Rainer Gerhards	2012-04-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	config directive was accepted, but had no effect
* \| \|	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
\| \| \|
* \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-07	3	-56/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html
\| * \|	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...
* \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-20	1	-2/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imptcp/imptcp.c
\| * \|	added configuration directive to disable octet-counted framing	Rainer Gerhards	2012-03-20	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \|	for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
* \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-19	3	-3/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
\| * \|	added configuration directive to disable octet-counted framing	Rainer Gerhards	2012-03-19	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \|	... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
* \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-14	3	-0/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \|	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
\| \| *	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	1	-1/+4
\| \| \|
* \| \|	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
\| * \|	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
\| \|\ \
* \| \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-02	1	-2/+5
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix for "/run/systemd/journal/syslog" detection	Marius Tomaschewski	2012-03-02	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
* \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-01	1	-0/+9
\|\\| \| \|
\| * \| \|	Detect if to use /run/systemd/journal/syslog under systemd	Marius Tomaschewski	2012-03-01	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* \| \| \|	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 'v4-stable' into v5-stable	Rainer Gerhards	2012-02-03	1	-16/+14
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	ommysql: put under ASL 2.0	Rainer Gerhards	2012-02-03	1	-16/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-27	3	-31/+35
\| \|\\| \|
\| \| * \|	bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵	Rainer Gerhards	2012-01-27	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configured
\| \| * \|	licensing change	Rainer Gerhards	2012-01-21	2	-31/+29
\| \| \| \|
* \| \| \|	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
* \| \| \|	imklog: forgot to remove one file; now done	Rainer Gerhards	2012-01-23	1	-35/+0
\| \| \| \|
* \| \| \|	refactored imklog linux driver, now combined with BSD driver	Rainer Gerhards	2012-01-23	7	-2063/+170
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver.
* \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-01-18	1	-15/+41
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	imptcp: added additional information to stats record	Rainer Gerhards	2012-01-18	1	-6/+10
\| \| \| \|
\| * \| \|	imptcp: added basic stats counters	Rainer Gerhards	2012-01-18	1	-10/+32
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-01-16	1	-17/+16
\| \|\\| \|
* \| \| \|	Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp	Rainer Gerhards	2012-01-17	3	-17/+294
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
\| * \| \| \|	elasticsearch: move to asl 2.0	Rainer Gerhards	2012-01-17	1	-14/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	email conversation Nathan/Rainer 2012-01-16&17
\| * \| \| \|	add elasticsearch output module	Nathan Scott	2012-01-17	2	-0/+279
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for sending events to elasticsearch - a distributed, RESTful, search engine built on Lucene (www.elasticsearch.org). The output module is enabled via a configure option, and uses libcurl to send the messages from rsyslog to elasticsearch. This patch makes use of the earlier JSON quoting patch to ensure valid JSON strings are sent to the server. Signed-off-by: Nathan Scott <nathans@aconex.com>
\| * \| \|	licensing update	Rainer Gerhards	2012-01-16	1	-17/+16
\| \| \| \|