| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'beta' into v6-stable | Rainer Gerhards | 2012-08-20 | 211 | -11720/+15449 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | nitfix: status indication (now: stable) was invalid in ChangeLogv6.4.0 | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 3 | -3/+61 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | nitfix: remove quirck in new debug message code | Rainer Gerhards | 2012-08-01 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | more elaborate debug logging for object deserializer | Rainer Gerhards | 2012-08-01 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 2 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 2 | -7/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347 | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 2 | -1/+5 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 3 | -3/+6 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | 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 '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 | Charlie Root | 2012-06-28 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | cleanup: remove config scoping system left-over | Rainer Gerhards | 2012-06-27 | 2 | -30/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it. | |||||
| | * | | | | | | | | | | | | | | | | | | | | improve invalid config command error message | Rainer Gerhards | 2012-06-27 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | bugfix: $ActionName was not properly honored | Rainer Gerhards | 2012-06-27 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us. | |||||
| | * | | | | | | | | | | | | | | | | | | | | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 3 | -3/+3 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-15 | 2 | -12/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c | |||||
| | * | | | | | | | | | | | | | | | | | | | bugfix: small memory leak in imptcp (static after config read) | Rainer Gerhards | 2012-06-14 | 1 | -1/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-14 | 13 | -1/+1552 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |