summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'c8'Rainer Gerhards2013-07-117-9/+65
|\ | | | | | | | | | | | | Conflicts: ChangeLog doc/imudp.html plugins/imudp/imudp.c
| * 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
|\| | | | | | | | | | | Conflicts: ChangeLog plugins/impstats/impstats.c
| * 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
| | | | | | | | | | | | | | | could happen if invalid actions were present, which could lead to improper handling in optimizer.
* | | 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 ↵Andre Lorbach2013-07-031-53/+79
| | | | | | | | | | | | | | | | rsyslog formats
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added needed javascript files, so they can be included into the svg files. This removes dependencies on external sources. The statslog-splitter can now automatically generated SVG or PNG charts together with an index.html in the output directory. This helps taking a quick view on all generated stats data.
| * | | Finsihed implementing chart gemerator script for impstats.Andre Lorbach2013-07-032-40/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSV Data generated by statslog-splitter is needed. To run the chart script, the following packages need to be installed: - python pip - python cairosvg With pip install these packages: - pip install CairoSVG tinycss cssselect pygal
| * | | 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
| | | | | | | | | | | | | | | | Python 2.6 or higher is needed to run the script
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-052-1/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: ChangeLog
| * | | bugfix: omlibdbi did not properly close connection on some errorsRainer Gerhards2013-07-052-1/+8
| | | | | | | | | | | | | | | | | | | | This happened to errors occuring in Begin/End Transaction entry points.
* | | | 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
|\| | |
| * | | doc: add CVE ID for omelasticsearch double-freev7.4.2Rainer Gerhards2013-07-051-0/+1
| | | |
* | | | make use of new librelp generic error reporting facilityRainer Gerhards2013-07-054-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | This leads to more error messages being passed to the user and thus simplified troubleshooting. librelp 1.2.0 is now required
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-041-2/+1
|\| | |
| * | | minor code reductionRainer Gerhards2013-07-041-2/+1
| | | |
* | | | bugfix: very small memory leak in imrelpRainer Gerhards2013-07-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | more or less cosmetic, a single memory block was not freed, but this only happens immediately before termination (when the OS automatically frees all memory). Still an annoyance e.g. in valgrind.
* | | | doc: mention that omelasticsearch bug requires custom config to be triggeredRainer Gerhards2013-07-041-0/+4
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-041-0/+4
|\| | |
| * | | doc: mention that omelasticsearch bug requires custom config to be triggeredRainer Gerhards2013-07-041-0/+4
| | | | | | | | | | | | | | | | This means the majority of users is not affected at all.
* | | | doc: mention omelasticsearch bugfix in 7.5.2 changelogRainer Gerhards2013-07-041-0/+7
| | | |
* | | | prepare for 7.5.2Rainer Gerhards2013-07-043-3/+3
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-041-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | doc: mention imported build patch for CENTOS5Rainer Gerhards2013-07-041-0/+1
| | | |
| * | | Merge branch 'v7-stable-hidden' into v7-stableRainer Gerhards2013-07-043-4/+8
| |\ \ \
| | * | | prepare for 7.4.2 releaseRainer Gerhards2013-07-043-4/+8
| | | | |
| * | | | Added header in typedefs.h needed for building on ehel 5Andre Lorbach2013-07-041-0/+4
| |/ / /
* | | | doc: add new omrelp parameter "windowSize"Rainer Gerhards2013-07-021-0/+13
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-021-3/+3
|\| | |
| * | | doc/imfile: re-do spelling correctionsRainer Gerhards2013-07-021-3/+3
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-020-0/+0
|\| | |
| * | | rollback html editor rewrite of imfileRainer Gerhards2013-07-021-165/+230
| | | |
* | | | doc: rollback html edit of imfile docRainer Gerhards2013-07-021-165/+230
| | | | | | | | | | | | | | | | | | | | The html editor did a total rewrite, which causes merges from older versions to fail miserably.
* | | | omrelp: add "windowSize" parameter to set custom RELP window sizeRainer Gerhards2013-07-022-0/+9
| | | |