summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
|
* doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
|
* 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-242-1/+2
|
* Merge branch 'v5-stable' into betaRainer Gerhards2012-07-243-9/+10
|\
| * bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4
| | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault.
| * bugfix: DA queue could cause abortRainer Gerhards2012-07-242-3/+6
| | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | 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-114-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 addedRainer Gerhards2012-07-102-20/+98
| |
* | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| |
* | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-092-17/+33
| |
* | debug log: cleaned up & streamlined queue param outputRainer Gerhards2012-07-051-20/+43
| |
* | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-053-3/+28
| |
* | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-023-5/+3
| |
* | cosmetic: added info about omelasticsearch to ChangeLogRainer Gerhards2012-06-291-0/+7
| |
* | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-296-52/+380
|\ \
| * | 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-243-3/+39
| | |
| * | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | | | | | | | | | | | The character immediately in front of the first escape was lost.
| * | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-252-0/+29
| | |
| * | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2339-316/+825
| |\ \ | | | | | | | | | | | | | | | | 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
| | | |
| * | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | | |
| * | | imuxsock: mini bugfix: closed fd was tried to close second timeRainer Gerhards2012-04-131-3/+6
| | | |
| * | | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster)
| * | | omelasticsearch: moved to v6 config systemRainer Gerhards2012-04-051-35/+91
| | | |
* | | | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaRainer Gerhards2012-06-291-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaAndre Lorbach2012-06-280-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'v6-stable' into betaAndre Lorbach2012-06-281-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
| | | | | |
* | | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
|/ / / / /
* | | | | cleanup: remove config scoping system left-overRainer Gerhards2012-06-272-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 messageRainer Gerhards2012-06-271-1/+2
| | | | |
* | | | | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-272-4/+4
| | | | | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us.
* | | | | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-183-3/+3
| | | | |
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-152-12/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-154-13/+10
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-152-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 properlyAbby Edwards2012-06-131-0/+2
| | | | |
| | * | | bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
| | | | |
* | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-1413-1/+1552
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-133-3/+5
| | | | |
| * | | | added rpm spec files for rhel / centosAbby Edwards2012-06-1312-0/+1549
| | | | |