Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 3 | -7/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | ||||
| * | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 3 | -7/+7 |
| | | | | | | | | This is done to prevent name claches with libraries. | ||||
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -13/+2 |
| |\ | |||||
* | | | 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 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | 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 | 1 | -20/+95 |
| | | | |||||
* | | | 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 | 1 | -15/+33 |
| | | | |||||
* | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -48/+374 |
|\ \ \ | |||||
| * | | | 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 | 1 | -1/+36 |
| | | | | |||||
| * | | | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 1 | -0/+28 |
| | | | | |||||
| * | | | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 9 | -25/+56 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| * | | | | imuxsock: mini bugfix: closed fd was tried to close second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | omelasticsearch: moved to v6 config system | Rainer Gerhards | 2012-04-05 | 1 | -35/+91 |
| | | | | | |||||
* | | | | | imklog: cleanup of no longer used code | Rainer Gerhards | 2012-06-29 | 2 | -32/+0 |
| | | | | | |||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-15 | 1 | -12/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c | ||||
| * \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-15 | 1 | -13/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | bugfix: randomized IP option header in omudpspoof caused problems | Rainer Gerhards | 2012-06-15 | 1 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch. | ||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 1 | -0/+11 |
| |\| | | | | |||||
* | | | | | | bugfix: small memory leak in imptcp (static after config read) | Rainer Gerhards | 2012-06-14 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Remove obsolete ommongodb build instructions | Miloslav Trmač | 2012-06-05 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin now uses libmongo-client (which is configured using pkg-config) instead of the 10gen client, so the instructions to copy client source code no longer apply. | ||||
* | | | | | | bugfix: invalid free in imptcp could lead to abort during startup | Rainer Gerhards | 2012-05-29 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+11 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+11 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵ | Rainer Gerhards | 2012-05-14 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads. Root cause is that libnet is not thread-safe. Omudpspoof now guards libnet calls with their own mutex. | ||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -1/+19 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | | | | | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect | ||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -1/+19 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -1/+19 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | ommysql: added support for new mysql_library_[init/exit] | Rainer Gerhards | 2012-05-03 | 1 | -1/+11 |
| | | | | | | | |||||
| | * | | | | | bugfix: ommysql did not properly init/exit the mysql runtime library | Rainer Gerhards | 2012-05-03 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up). | ||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| |\| | | | | | |||||
| | * | | | | | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect | ||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 1 | -10/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | | | | | | | cleanup: removed unused but set parameters | Rainer Gerhards | 2012-04-23 | 2 | -4/+1 |
| | | | | | | | |||||
* | | | | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configured | Rainer Gerhards | 2012-04-23 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | bugfix/imuxsock: configured hostname was not used | Rainer Gerhards | 2012-04-16 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | bugfix/imuxsock: solving abort if hostname was not set | Rainer Gerhards | 2012-04-16 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | make "old" omelasticsearch compile | Rainer Gerhards | 2012-04-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this module is to be replaced by branch currently in development. But I want to be able to compile the previous one, at least ;) | ||||
* | | | | | | imuxsock: mini bugfix: closed fd was tried to close a second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
| | | | | | |