| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |\ \ \ \ | |||||
| | | * | | | | | | imklog: cleanup of no longer used code | Rainer Gerhards | 2012-06-29 | 2 | -32/+0 |
| | | |/ / / / / | |||||
| | * | | | | | | imklog: support for module() global config parameters added | Rainer Gerhards | 2012-06-29 | 2 | -58/+116 |
| | | | | | | | | |||||
| | * | | | | | | immark: support for module() global config parameters added | Rainer Gerhards | 2012-06-27 | 2 | -4/+67 |
| | | | | | | | | |||||
| | * | | | | | | imuxsock: support for module() global config parameters added | Rainer Gerhards | 2012-06-27 | 1 | -47/+128 |
| | | | | | | | | |||||
| | * | | | | | | $actionname was not properly set via legacy directive | Rainer Gerhards | 2012-06-27 | 1 | -4/+0 |
| | | | | | | | | |||||
| | * | | | | | | provide support to dynamically enable/disable legacy conf command | Rainer Gerhards | 2012-06-26 | 5 | -24/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most important to prevent clashes with new style settings | ||||
| | * | | | | | | imudp: support for module() global config parameters added | Rainer Gerhards | 2012-06-26 | 2 | -64/+71 |
| | | | | | | | | |||||
| | * | | | | | | impstats: support for module() global config parameters added | Rainer Gerhards | 2012-06-26 | 1 | -25/+103 |
| | | | | | | | | |||||
| | * | | | | | | modules: call new-style entry point only when new-style stmt is used | Rainer Gerhards | 2012-06-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a way for modules to differentiate between old- and new- style config, so that they can react accordingly. | ||||
| | * | | | | | | omudpspoof: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -6/+132 |
| | | | | | | | | |||||
| | * | | | | | | omudpspoof: remove actually not existing compresion level param | Rainer Gerhards | 2012-06-25 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be a copy&paste problem from the initial implementation. The parameter was never documented (how could it have been? ;)), so this causes no problems. In fact, it also did nothing except setting a few never-used variables ;) | ||||
| | * | | | | | | omuxsock: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -4/+128 |
| | | | | | | | | |||||
| | * | | | | | | doc: typo fix | Rainer Gerhards | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | ompipe: fix copy&paste name errors | Rainer Gerhards | 2012-06-25 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | omfwd: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -8/+127 |
| | | | | | | | | |||||
| | * | | | | | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 2 | -5/+107 |
| | | | | | | | | |||||
| | * | | | | | | a bit more cleanup | Rainer Gerhards | 2012-06-25 | 1 | -5/+2 |
| | | | | | | | | |||||
| | * | | | | | | cleanup & fix of mini-leak | Rainer Gerhards | 2012-06-25 | 2 | -5/+3 |
| | | | | | | | | |||||
| | * | | | | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 12 | -37/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable. | ||||
| | * | | | | | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 8 | -41/+220 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some nits to iron out, only omfile actually support module params | ||||
| | * | | | | | | milestone: module() can load module in legacy mode | Rainer Gerhards | 2012-06-20 | 6 | -13/+65 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Andre Lorbach | 2012-06-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'beta' | Charlie Root | 2012-06-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | | Merge branch 'beta' | Andre Lorbach | 2012-06-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| | * | | | | | | Merge branch 'v6-stable' into beta | Charlie Root | 2012-06-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | | Added dragonfly to configure.ac | Bartosz Kuzma | 2012-06-27 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-27 | 5 | -37/+8 |
| |\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |