Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: describe "CEE cookie" required by mmjsonparse | Rainer Gerhards | 2013-09-16 | 1 | -0/+10 |
| | | | | ... as well as other format requirements. | ||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-16 | 2 | -1/+4 |
|\ | |||||
| * | bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was misspelled | Rainer Gerhards | 2013-09-16 | 2 | -1/+4 |
| | | | | | | | | Thanks to David Lang for alerting us | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-13 | 2 | -2/+4 |
|\| | |||||
| * | bugfix: small memory leak in imfile when $ResetConfigVariables was used | Grégory Nuyttens | 2013-09-13 | 2 | -2/+4 |
| | | | | | | | | Thanks to Grégory Nuyttens for reporting this bug and providig a fix | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-13 | 4 | -3/+25 |
|\| | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | bugfix: segfault on startup if TCP TLS was used but no cert or key set | Rainer Gerhards | 2013-09-13 | 3 | -1/+14 |
| | | |||||
| * | Merge branch 'v7-stable' into v7-stable-tlsfix | Rainer Gerhards | 2013-09-13 | 204 | -2928/+16887 |
| |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | bugfix: segfault on startup if TLS was used but no CA cert set | Rainer Gerhards | 2013-09-13 | 4 | -2/+11 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-12 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c runtime/cryprov.h | ||||
| * | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem Conflicts: ChangeLog runtime/cryprov.h | ||||
| * | | omelasticsearch: straighten out statistics counters | Rainer Gerhards | 2013-09-11 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
* | | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 3 | -3/+5 |
| | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem | ||||
* | | | omelasticsearch: straighten out statistics counters | Rainer Gerhards | 2013-09-11 | 1 | -13/+13 |
| | | | |||||
* | | | preparing for 7.5.3 releasev7.5.3 | Rainer Gerhards | 2013-09-11 | 3 | -3/+3 |
| | | | |||||
* | | | regression fix: message properties did not work | Rainer Gerhards | 2013-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | This was a regeression from the global/local variabe work done for this release. Consequently, this problem did not occur in any released version. | ||||
* | | | omelasticsearch: adapt to new stats subsystem extensions | Rainer Gerhards | 2013-09-10 | 1 | -4/+4 |
| | | | |||||
* | | | doc: nit fixing | Rainer Gerhards | 2013-09-10 | 1 | -9/+8 |
| | | | |||||
* | | | imrelp: adapt to new stats subsystem extensions | Rainer Gerhards | 2013-09-10 | 1 | -1/+1 |
| | | | |||||
* | | | doc: add queue parameter skeleton | Florian Riedl | 2013-09-10 | 1 | -0/+71 |
| | | | |||||
* | | | doc: clarify global/local variables | Rainer Gerhards | 2013-09-10 | 2 | -2/+3 |
| | | | |||||
* | | | doc: add reference to relevant blog posting (imfile "escapeLF" param) | Rainer Gerhards | 2013-09-10 | 2 | -1/+3 |
| | | | |||||
* | | | doc: clarify imfile "escapeLF" paramter availability | Rainer Gerhards | 2013-09-10 | 1 | -1/+1 |
| | | | |||||
* | | | imfile: support LF escaping in read mode 2 | Rainer Gerhards | 2013-09-10 | 2 | -6/+29 |
| | | | |||||
* | | | imfile: support LF escaping in read mode 1 | Rainer Gerhards | 2013-09-10 | 4 | -11/+42 |
| | | | |||||
* | | | doc: add new impstats feature to ChangeLog | Rainer Gerhards | 2013-09-09 | 1 | -0/+2 |
| | | | |||||
* | | | impstats: implement parameter "resetCounters" | Rainer Gerhards | 2013-09-09 | 4 | -19/+39 |
| | | | | | | | | | | | | | | | it provides the capability to make impstats emit deltas in contrast to accumulated counter values (see doc for details). | ||||
* | | | impstats: reset stats counters no matter if CEE or regular mode is used | Rainer Gerhards | 2013-09-09 | 1 | -3/+17 |
| | | | |||||
* | | | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-07 | 10 | -33/+41 |
| | | | |||||
* | | | imudp: use inputname for statistics, if configured | Rainer Gerhards | 2013-09-05 | 2 | -3/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-05 | 3 | -3/+7 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | bugfix: some more build problems with newer json-c versions | Rainer Gerhards | 2013-09-04 | 3 | -2/+6 |
| | | | | | | | | | | | | Thanks to Michael Biebl for mentioning the problem. | ||||
| * | | prepare for 7.4.4 releasev7.4.4 | Rainer Gerhards | 2013-09-03 | 3 | -3/+3 |
| | | | |||||
* | | | doc: mention imported patches in ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 2 | -1/+9 |
|\| | | |||||
| * | | doc: add some more non-mentioned fixes to ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+4 |
| | | | |||||
| * | | regression fix: previous fix introduced wrong default template | Rainer Gerhards | 2013-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | The faulty code was never released. | ||||
| * | | doc: add missing information (patches) to ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 13 | -15/+20 |
|\| | | |||||
| * | | doc: mention last json-c patch in ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+2 |
| | | | |||||
| * | | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 12 | -15/+18 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 2 | -1/+4 |
|\| | | |||||
| * | | bugfix: imfile parameter "persistStateInterval" was unusable | Rainer Gerhards | 2013-09-02 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | due to a case typo in imfile; work-around was to use legacy config Thanks to Brandon Murphy for reporting this bug. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 5 | -9/+24 |
|\| | | |||||
| * | | doc: add recent patch series to ChangeLog | Rainer Gerhards | 2013-09-02 | 1 | -0/+8 |
| | | | |||||
| * | | Using more appropriate helper function to get the error message | Ahto Truu | 2013-09-02 | 1 | -1/+1 |
| | | | |||||
| * | | Better error messages from rsgtutil | Ahto Truu | 2013-09-02 | 1 | -4/+4 |
| | | | |||||
| * | | More careful TLV encoding/decoding | Ahto Truu | 2013-09-02 | 3 | -4/+11 |
| | | | |||||
* | | | Merge branch 'c9' | Rainer Gerhards | 2013-09-02 | 10 | -4/+64 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | | doc: add "defaultTZ" param to imtcp doc | Rainer Gerhards | 2013-09-02 | 1 | -2/+13 |
| | | | |