summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into master-zipflushRainer Gerhards2013-07-152-8/+9
|\
| * bugfix: stream compression in imptcp caused timestamp to be corruptedRainer Gerhards2013-07-152-7/+9
* | milestone: tcp stream compression support for transaction boundariesRainer Gerhards2013-07-153-10/+57
|/
* Merge branch 'v7-stable'Rainer Gerhards2013-07-152-3/+16
|\
| * fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-153-4/+4
| * bugfix: 100% CPU utilization when DA queue became fullAndre Lorbach2013-07-152-3/+16
* | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-153-4/+4
* | Merge branch 'v7-stable'Rainer Gerhards2013-07-131-12/+12
|\|
| * nit: use correct function names in new debug instrumentationRainer Gerhards2013-07-131-12/+12
| * Changed and extended debug output in queue/action classes for further analysisAndre Lorbach2013-07-131-6/+6
* | Merge remote-tracking branch 'andre/v7-stats-scripts' into tmpRainer Gerhards2013-07-122-19/+58
|\ \
| * \ Merge branch 'master' into v7-stats-scriptsAndre Lorbach2013-07-127-9/+65
| |\ \
| * | | Removed commandline arg count limit from scriptsAndre Lorbach2013-07-122-2/+2
| * | | Added new option "chartscalcdelta" to generate charts with delta values inste...Andre Lorbach2013-07-112-11/+34
| * | | Merge branch 'master' into v7-stats-scriptsAndre Lorbach2013-07-1114-230/+476
| |\ \ \
| * | | | Added command line switch to generate bar charts in statslog-splitter.pyAndre Lorbach2013-07-051-6/+22
* | | | | Merge branch 'c8'Rainer Gerhards2013-07-123-64/+196
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | imudp: add support for recvmmsg()Rainer Gerhards2013-07-113-22/+59
| * | | | imudp milestone: recvmmsg() now supported, but reads only a single msgRainer Gerhards2013-07-111-2/+62
| * | | | imudp: fix error message on socket error conditionRainer Gerhards2013-07-111-1/+1
| * | | | imudp: refactor to use recvmsg() in preparation for recvmmsg()Rainer Gerhards2013-07-111-10/+18
| * | | | imudp: refactor in preparation of recvmmsg() enhancementRainer Gerhards2013-07-111-60/+77
* | | | | Merge branch 'c8'Rainer Gerhards2013-07-117-9/+65
|\| | | | | |_|/ / |/| | |
| * | | imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter)Rainer Gerhards2013-07-117-16/+70
* | | | Merge branch 'c8'Rainer Gerhards2013-07-112-1/+60
|\| | |
| * | | impstats: add process resource usage counters [via getrusage()]Rainer Gerhards2013-07-112-1/+60
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-102-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | doc: mention recent build system patchRainer Gerhards2013-07-101-0/+2
| * | | fix build on FreeBSDCristiano Rolim2013-07-101-0/+2
* | | | fix compile problem in debug buildRainer Gerhards2013-07-092-2/+1
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-071-1/+20
|\| | |
| * | | doc: instructions for rotating signed filesRainer Gerhards2013-07-071-1/+20
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-061-9/+9
|\| | |
| * | | imfile changes back again, but with retained formatRadu Gheorghe2013-07-061-9/+9
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-052-49/+63
|\| | |
| * | | bugfix: potential segfault during startup on invalid configRainer Gerhards2013-07-052-49/+63
* | | | Merge remote-tracking branch 'andre/v7-stats-scripts'Rainer Gerhards2013-07-054-0/+9746
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed Datetime detectionAndre Lorbach2013-07-031-3/+4
| * | | Added support for multiple regex commands, useful for parsing multiple rsyslo...Andre Lorbach2013-07-031-53/+79
| * | | Added more command line options to customize the charts and their outputAndre Lorbach2013-07-032-4/+31
| * | | Finished statslog graph and splitter script.Andre Lorbach2013-07-034-26/+9368
| * | | Finsihed implementing chart gemerator script for impstats.Andre Lorbach2013-07-032-40/+150
| * | | Started implementing stats chart generatorAndre Lorbach2013-07-021-0/+107
| * | | Added script to split impstats logfiles into processable csv filesAndre Lorbach2013-07-021-0/+133
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-052-1/+8
|\ \ \ \ | | |/ / | |/| |
| * | | bugfix: omlibdbi did not properly close connection on some errorsRainer Gerhards2013-07-052-1/+8
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-051-3/+9
|\| | |
| * | | omlibdbi: improve debug reporting on Begin/EndTXRainer Gerhards2013-07-051-3/+9
* | | | doc: add CVE ID for omelasticsearch double-freeRainer Gerhards2013-07-051-0/+1
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-051-0/+1
|\| | |