Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: improve imptcp doc | Rainer Gerhards | 2012-11-26 | 1 | -8/+10 |
| | |||||
* | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | imklog: added $klogParseKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time. | ||||
| | * | imklog: added $klogKeepKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too. | ||||
* | | | prepare for 7.2.3 releasev7.2.3 | Rainer Gerhards | 2012-11-21 | 1 | -1/+1 |
| | | | |||||
* | | | prepare 7.2.2 releasev7.2.2 | Rainer Gerhards | 2012-11-16 | 1 | -1/+1 |
| | | | |||||
* | | | doc: describe leading space problem with "startswith" comparison | Rainer Gerhards | 2012-11-14 | 1 | -3/+8 |
| | | | |||||
* | | | doc: upgrade ruleset doc to v7 config system | Konstantin Schmitt | 2012-11-12 | 3 | -98/+227 |
| | | | |||||
* | | | doc: $ActionQueueDiscardSeverity had wrong default documented | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The doc contained a previous default, which has been changed in the mean time. | ||||
* | | | Added imkmsg^imklog to imkmsg documentation. | Milan Bartos | 2012-11-05 | 1 | -2/+4 |
| | | | |||||
* | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
* | | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 |
|\| | | |||||
| * | | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | | |||||
| * | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 20 | -152/+1289 |
| |\ \ | |||||
| | * | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | |\ \ | |||||
* | | | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | ||||
* | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
| | * | | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 2 | -10/+19 |
| | |\ \ | |||||
| | | * | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for 7.1.9 releasev7.1.9 | Rainer Gerhards | 2012-10-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
|\| | | | | |||||
| * | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
| * | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for 7.1.8 releasev7.1.8 | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: update module doc to new capabilities | Florian Riedl | 2012-10-02 | 6 | -64/+135 |
| | | | | | |||||
* | | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: add SQL-template example | Tim Eifler | 2012-10-01 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 5 | -107/+373 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | |||||
* | | | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'milan/imkmsg' | Rainer Gerhards | 2012-09-24 | 1 | -0/+48 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation for new imkmsg module | Milan Bartos | 2012-09-24 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | new file: doc/imkmsg.html | ||||
* | | | | | | doc: Improve template system doc | Rainer Gerhards | 2012-09-24 | 1 | -51/+151 |
|/ / / / / | |||||
* | | | | | Fiddeling a bit with the template doc | Florian Riedl | 2012-09-24 | 1 | -60/+111 |
| | | | | |