summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-1/+1
| | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-6/+0
|\
| * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-6/+0
| | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+7
|\| | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+7
| |
* | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-201-0/+0
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
|\| | | | | | | | | Conflicts: ChangeLog
| * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-1/+5
| |
| * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
|\|
| * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| |
* | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
| | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-253-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/RSFALSERainer Gerhards2012-08-223-7/+7
| | | | | | | | This is done to prevent name claches with libraries.
| * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-13/+2
| |\
* | | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-241-1/+1
| | |
* | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| | | | | | | | | | | | this was not present in any released version
* | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-112-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 addedRainer Gerhards2012-07-101-20/+95
| | |
* | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| | |
* | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-15/+33
| | |
* | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-48/+374
|\ \ \
| * | | omelasticsearch: bugfix: bulkmode setting was not properly initializedRainer Gerhards2012-06-131-0/+1
| | | |
| * | | omelasticsearch: dyn index&type now also supported in bulk modeRainer Gerhards2012-05-281-4/+7
| | | |
| * | | omelasticsearc: milestone, bulk insert basically worksRainer Gerhards2012-05-251-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 interfaceRainer Gerhards2012-05-251-11/+85
| | | | | | | | | | | | | | | | | | | | This obviously does not work correctly. So expect problems if you set bulkmode="on".
| * | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-241-1/+36
| | | |
| * | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+28
| | | |
| * | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-239-25/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| * | | | omelasticsearch: added asnycRepl and timeout config paramsRainer Gerhards2012-04-161-3/+26
| | | | |
| * | | | omelasticsearch: permit dynamic index/type parameters (just like dynafile)Rainer Gerhards2012-04-131-16/+107
| | | | |
| * | | | imuxsock: mini bugfix: closed fd was tried to close second timeRainer Gerhards2012-04-131-3/+6
| | | | |
| * | | | omelasticsearch: moved to v6 config systemRainer Gerhards2012-04-051-35/+91
| | | | |
* | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
| | | | |
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-151-12/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| * \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-151-13/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-151-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-stableRainer Gerhards2012-06-011-0/+11
| |\| | | |
* | | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
| | | | | |
* | | | | | Remove obsolete ommongodb build instructionsMiloslav Trmač2012-06-051-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 startupRainer Gerhards2012-05-291-0/+2
| | | | | |
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-291-0/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-291-0/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵Rainer Gerhards2012-05-141-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-betaRainer Gerhards2012-05-031-1/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-191-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-031-1/+19
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-1/+19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 21:31:01 +0000