Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add elasticsearch output module | Nathan Scott | 2012-01-17 | 5 | -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 option | Nathan Scott | 2012-01-17 | 3 | -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.7 | Rainer Gerhards | 2012-01-17 | 3 | -3/+5 |
| | |||||
* | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | |||||
* | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 |
|\ | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| * | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 2 | -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-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 |
|\| | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h | ||||
| * | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 |
| | | |||||
| * | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 |
| | | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
|\| | |||||
| * | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | | | | | | | | after careful consideration of affected code | ||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 |
|\| | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| * | more license analysis & change | Rainer Gerhards | 2012-01-14 | 11 | -178/+163 |
| | | |||||
| * | rsyslog.conf.5 socket module example sb imuxsock | Jim Hill | 2012-01-14 | 1 | -1/+1 |
| | | |||||
| * | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | | |||||
| * | some more files to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 7 | -108/+104 |
| | | |||||
| * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 20 | -294/+316 |
| | | | | | | | | after carful check for copyright holder | ||||
* | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | | |||||
* | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 2 | -5/+7 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | |||||
* | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 2 | -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-stable | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 |
|\| | |||||
| * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 2 | -4/+4 |
| | | |||||
| * | added doc for omprog | Rainer Gerhards | 2011-12-16 | 3 | -0/+45 |
| | | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
|\| | | | | | | | | | Conflicts: action.c | ||||
| * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
| |\ | |||||
| | * | bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stable | Tomas Heinrich | 2011-12-01 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 2 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
|\| | | |||||
| * | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
|\| | | |||||
| * | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 2 | -3/+15 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 2 | -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.6 | Rainer Gerhards | 2011-10-21 | 3 | -3/+3 |
| | | | |||||
* | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 5 | -6/+18 |
| | | | |||||
* | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
|\ \ \ | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
| |\| | | |||||
| | * | | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | minor: slightly improved error reporting when dynafile open fails | Rainer Gerhards | 2011-10-20 | 1 | -2/+3 |
|/ / / | |||||
* | | | bugfix: $OMFileFlushInterval period was doubled - now using correct value | Rainer Gerhards | 2011-10-18 | 2 | -1/+2 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
|\| | | |||||
| * | | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 3 | -9/+54 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | doc: mention imported bugfix in ChangeLog | Rainer Gerhards | 2011-10-13 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 2 | -1/+2 |
| |\| | | |||||
| | * | | bugfix: $ActionExecOnlyOnce interval did not work properly | Tomas Heinrich | 2011-10-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | bugfix: race condition when extracting structured data and PROCID | Rainer Gerhards | 2011-10-13 | 2 | -5/+25 |
| | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME | ||||
| * | | | bugfix: race condition when extracting program name and APPNAME | Rainer Gerhards | 2011-10-13 | 2 | -5/+27 |
| | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names |