Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -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-stable | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 |
|\ | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| * | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 1 | -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-stable | Rainer Gerhards | 2012-01-14 | 13 | -194/+178 |
|\| | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -15/+14 |
| | | | | | | | | after carful check for copyright holder | ||||
* | | minor: slightly improved error reporting when dynafile open fails | Rainer Gerhards | 2011-10-20 | 1 | -2/+3 |
| | | |||||
* | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -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-stable | Rainer Gerhards | 2011-09-22 | 2 | -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 and | Rainer Gerhards | 2011-09-20 | 1 | -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-stable | Rainer Gerhards | 2011-09-15 | 3 | -31/+98 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * \ | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 2 | -2/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * \ \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | ||||
| * | | | | | | typo fix | Andrew Stothard | 2011-09-15 | 2 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | bugfix: rsyslogd -v always said 64 atomics were not present | mono_matsuko | 2011-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-30 | 1 | -3/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c | ||||
| * | | | | | bugfix: off-by-one(two) bug in legacy syslog parser | Rainer Gerhards | 2011-08-10 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
* | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
|\| | | | | |||||
| * | | | | doc: updated rsyslog.conf man page with new syntaxes | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| | |_|/ | |/| | | |||||
* | | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| * | | | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
| | | | | |||||
* | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
|\| | | |||||
| * | | bugfix: invalid storage type for config variables | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 |
| | | | |||||
| * | | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵ | Tomas Heinrich | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | bugfix(minor): improper template function call in syslogd.c | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | bugfix: RFC5424 parser confused by empty structured data | Rainer Gerhards | 2011-03-22 | 1 | -2/+1 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237 | ||||
* | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| * | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
* | | | | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 12 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 12 | -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 aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | regression: fixed compile error with --enable-debug | Rainer Gerhards | 2011-02-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | bugfix: fixed compile problem due to empty structs | Dražen Kačar | 2011-02-16 | 1 | -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 removed | Rainer Gerhards | 2011-02-16 | 3 | -10/+6 |
| | | | | |||||
* | | | | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -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-devel | Rainer Gerhards | 2010-12-17 | 1 | -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 bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -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 |