Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add support for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -30/+121 |
| | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off) | ||||
* | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-08-02 | 2 | -1/+8 |
|\ | |||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 2 | -1/+8 |
| |\ | |||||
| | * | doc: add last patch to Changelog | Rainer Gerhards | 2012-08-01 | 1 | -0/+3 |
| | | | |||||
| | * | fix problem with cutting first 16 characters from message with bAnnotate on ↵ | Milan Bartos | 2012-08-01 | 1 | -1/+5 |
| | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
* | | | doc: added last patch to ChangeLog | Rainer Gerhards | 2012-07-31 | 1 | -0/+2 |
| | | | |||||
* | | | Fix $SystemLogSocketAnnotate | Miloslav Trmač | 2012-07-31 | 1 | -3/+2 |
|/ / | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | imzmq3: Added the return call to runInput | David Kelly | 2012-07-31 | 1 | -0/+1 |
| | | | | | | | | | | Just to be sure that nothing unfortunate would happen, possible that housekeeping would not get done without this. | ||||
* | | BAT-40 Found leak in imzmq3 plugin | David Kelly | 2012-07-31 | 1 | -1/+4 |
| | | | | | | | | | | For some reason I forgot to free() the buffer that comes back from zstr_recv(). Doh! | ||||
* | | doc: improved doc for built-in modules | Florian Riedl | 2012-07-24 | 7 | -24/+443 |
| | | |||||
* | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 10 | -60/+257 |
|\| | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| |\ | |||||
| * | | omelasticsearch: regression from "parent" feature could case aborts | Rainer Gerhards | 2012-07-11 | 1 | -23/+26 |
| | | | | | | | | | | | | this was not present in any released version | ||||
| * | | bugfix: imtcp aborted when more than 2 connections were used. | Andre Lorbach | 2012-07-11 | 4 | -3/+6 |
| | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342 | ||||
| * | | omelasticsearch: support for parameters parent & dynparent added | Rainer Gerhards | 2012-07-10 | 2 | -20/+98 |
| | | | |||||
| * | | omelasticsearch: implement retry via request to es server homepage | Rainer Gerhards | 2012-07-10 | 1 | -10/+60 |
| | | | |||||
| * | | omelasticsearch: better debug instrumentation | Rainer Gerhards | 2012-07-09 | 2 | -17/+33 |
| | | | |||||
| * | | debug log: cleaned up & streamlined queue param output | Rainer Gerhards | 2012-07-05 | 1 | -20/+43 |
| | | | |||||
| * | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 3 | -3/+28 |
| | | | |||||
| * | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 3 | -5/+3 |
| | | | |||||
* | | | Merge branch 'v5-stable' | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | bugfix: strm class could abort under some circumstances | Rainer Gerhards | 2012-07-24 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault. | ||||
| * | | bugfix: DA queue could cause abort | Rainer Gerhards | 2012-07-24 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked. | ||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-07-24 | 0 | -0/+0 |
|\ \ \ | |||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 4 | -13/+10 |
| |\| | | |||||
* | | | | bugfix: omhdfs did no longer compile | Rainer Gerhards | 2012-07-11 | 2 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 7 | -52/+387 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | cosmetic: added info about omelasticsearch to ChangeLog | Rainer Gerhards | 2012-06-29 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 6 | -52/+380 |
| |\ \ \ | |||||
| | * | | | omelasticsearch: bugfix: bulkmode setting was not properly initialized | Rainer Gerhards | 2012-06-13 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | omelasticsearch: dyn index&type now also supported in bulk mode | Rainer Gerhards | 2012-05-28 | 1 | -4/+7 |
| | | | | | |||||
| | * | | | omelasticsearc: milestone, bulk insert basically works | Rainer Gerhards | 2012-05-25 | 1 | -50/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | dynamic index&type is not yet used, but easy to add (did not manage to get it in today...) | ||||
| | * | | | omelasticsearch: test commit, first shot at bulk interface | Rainer Gerhards | 2012-05-25 | 1 | -11/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This obviously does not work correctly. So expect problems if you set bulkmode="on". | ||||
| | * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 3 | -3/+39 |
| | | | | | |||||
| | * | | | property replacer lost one char when json escaping was necessary | Rainer Gerhards | 2012-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost. | ||||
| | * | | | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 2 | -0/+29 |
| | | | | | |||||
| | * | | | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 39 | -316/+825 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| | * | | | | omelasticsearch: added asnycRepl and timeout config params | Rainer Gerhards | 2012-04-16 | 1 | -3/+26 |
| | | | | | | |||||
| | * | | | | omelasticsearch: permit dynamic index/type parameters (just like dynafile) | Rainer Gerhards | 2012-04-13 | 1 | -16/+107 |
| | | | | | | |||||
| | * | | | | permitting plugins to use three string requests | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
| | | | | | | |||||
| | * | | | | imuxsock: mini bugfix: closed fd was tried to close second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
| | | | | | | |||||
| | * | | | | omelasticsearch: used new property replacer options for default template | Rainer Gerhards | 2012-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster) | ||||
| | * | | | | omelasticsearch: moved to v6 config system | Rainer Gerhards | 2012-04-05 | 1 | -35/+91 |
| | | | | | | |||||
* | | | | | | Merge branch 'master-module' | Rainer Gerhards | 2012-06-29 | 32 | -345/+1373 |
|\ \ \ \ \ \ | |||||
| * | | | | | | imklog: removal of no longer needed config directives | Rainer Gerhards | 2012-06-29 | 2 | -37/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 6 | -38/+7 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | | | | | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into beta | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into beta | Andre Lorbach | 2012-06-28 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'v6-stable' into beta | Andre Lorbach | 2012-06-28 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ |