Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Added dragonfly to configure.ac | Bartosz Kuzma | 2012-06-27 | 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 | ||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-15 | 4 | -13/+10 |
| |\ \ \ | |||||
| | * | | | bugfix: randomized IP option header in omudpspoof caused problems | Rainer Gerhards | 2012-06-15 | 2 | -13/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch. | ||||
| | * | | | adding pkgconfigdir definition to Makefile.am to help build properly | Abby Edwards | 2012-06-13 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | bugfix "$PreserveFQDN on" was not honored in some modules | Rainer Gerhards | 2012-06-12 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- | ||||
* | | | | | 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 | ||||
| * | | | | preparing for 6.2.2 releasev6.2.2 | Rainer Gerhards | 2012-06-13 | 3 | -3/+5 |
| | | | | | |||||
| * | | | | added rpm spec files for rhel / centos | Abby Edwards | 2012-06-13 | 12 | -0/+1549 |
| | | | | | |||||
* | | | | | adding pkgconfigdir definition to Makefile.am to help build properly | Abby Edwards | 2012-06-13 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 2 | -4/+38 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 3 | -5/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 3 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting | ||||
| * | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris | ||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | | | | | bugfix: expression-based filters with AND/OR could segfault | Rainer Gerhards | 2012-06-11 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to a problem with boolean shortcut operations. From the user's perspective, the segfault is almost non-deterministic (it occurs when a shortcut is used). Thanks to Lars Peterson for providing the initial bug report and his support in solving it. | ||||
* | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 7 | -34/+62 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c | ||||
| | * | | | | preparing for 5.8.12v5.8.12 | Rainer Gerhards | 2012-06-06 | 3 | -3/+3 |
| | | | | | | |||||
| | * | | | | bugfix: property PROCID was empty instead of proper nilvalue if not present | Rainer Gerhards | 2012-06-06 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue. | ||||
| | * | | | | bugfix: potential hang due to mutex deadlock | Rainer Gerhards | 2012-06-06 | 4 | -33/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it. | ||||
| | * | | | | fixing memleak in recent group resolve patch | Rainer Gerhards | 2012-06-06 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | also added some error checking | ||||
| | * | | | | call getgrnam_r repeatedly to get all group members. | Alec Warner | 2012-06-06 | 1 | -3/+12 |
| | | | | | |