summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add elasticsearch output moduleNathan Scott2012-01-175-0/+323
| | | | | | | | | | | | 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>
* add JSON escaping optionNathan Scott2012-01-173-38/+63
| | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com>
* preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
|
* licensing updateRainer Gerhards2012-01-161-17/+16
|
* Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| | | | | | | | | | | | ..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-1665-1001/+882
|\| | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| * license changesRainer Gerhards2012-01-1645-704/+617
| |
| * runtime license changeRainer Gerhards2012-01-1620-297/+265
| |
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
|\|
| * license changeRainer Gerhards2012-01-142-35/+30
| | | | | | | | after careful consideration of affected code
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
|\| | | | | | | | | | | | | | | 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
| |
| * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| |
| * some more files to ASL 2.0Rainer Gerhards2012-01-117-108/+104
| |
| * relicense parts under ASL 2.0Rainer Gerhards2012-01-1120-294/+316
| | | | | | | | after carful check for copyright holder
* | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| |
* | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-092-5/+7
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-202-0/+3
| |
* | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-202-2/+9
| | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-164-4/+49
|\|
| * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-162-4/+4
| |
| * added doc for omprogRainer Gerhards2011-12-163-0/+45
| |
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-013-2/+5
|\| | | | | | | | | Conflicts: action.c
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-013-2/+5
| |\
| | * bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stableTomas Heinrich2011-12-012-2/+4
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-012-1/+2
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-11-031-3/+2
|\| |
| * | doc bugfix: typo in imgssapi docRainer Gerhards2011-11-031-3/+2
| | |
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-251-1/+3
|\| |
| * | doc: imfile: clarified that empty lines are not processedRainer Gerhards2011-10-251-1/+3
| | |
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-272-3/+15
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-272-3/+10
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | preparing for 5.8.6 releasev5.8.6Rainer Gerhards2011-10-213-3/+3
| | |
* | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-215-6/+18
| | |
* | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-212-5/+5
|\ \ \
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-202-5/+5
| |\| |
| | * | doc bugfix: pri-text neees to be fixed in an article as wellRainer Gerhards2011-10-201-3/+3
| | | |
| | * | doc bug: property pri-text was incorrectly describedRainer Gerhards2011-10-201-2/+2
| | | |
* | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
|/ / /
* | | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-182-1/+2
| | |
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-171-0/+2
|\| |
| * | doc: clarified that imklog does not support SolarisRainer Gerhards2011-10-171-0/+2
| | |
* | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-173-9/+54
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | doc: mention imported bugfix in ChangeLogRainer Gerhards2011-10-131-0/+2
| | | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-132-1/+2
| |\| |
| | * | bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-132-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-132-5/+25
| | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| * | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-132-5/+27
| | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names