summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* add elasticsearch output moduleNathan Scott2012-01-171-0/+3
| | | | | | | | | | | | 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>
* Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-1/+21
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-2/+22
| | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1413-194/+178
|\| | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| |
| * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| |
| * relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
| | | | | | | | after carful check for copyright holder
* | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| |
* | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-3/+2
| | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-222-6/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
| * bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-4/+10
| | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| * Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-153-31/+98
| |\
| | * Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | | |
| | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-112-2/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| * | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| * | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | |_|_|/ | |/| | |
* | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
* | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
|\| | | |
| * | | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | |_|/ | |/| |
* | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| | | |
* | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| * | | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9
| | | |
* | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3
| | |/ | |/|
* | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-091-2/+2
|\| |
| * | bugfix: invalid storage type for config variablesRainer Gerhards2011-05-091-1/+1
| | |
| * | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵Tomas Heinrich2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| | |
* | | bugfix: RFC5424 parser confused by empty structured dataRainer Gerhards2011-03-221-2/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237
* | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
| | | |
* | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
| * | | bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-0/+5
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
* | | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0612-0/+12
|\ \ \ \
| * | | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2312-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | cosmetic: removing commented-out testing aidRainer Gerhards2011-02-251-1/+0
|/ / / /
* | | | bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| | | |
* | | | regression: fixed compile error with --enable-debugRainer Gerhards2011-02-211-1/+0
| | | |
* | | | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-163-10/+6
| | | |
* | | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-1/+1
| | | |
* | | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
* | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-3/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| * | | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect