1202 Commits

Author SHA1 Message Date
Rainer Gerhards
03ff013c24 omudpspoof: improve libnet calling sequence
retains bugfix while increasing performance again
2012-12-18 09:56:55 +01:00
Rainer Gerhards
97d6350b9f doc: added v7 conf samples to omudpspoof doc 2012-12-18 09:34:21 +01:00
Rainer Gerhards
5d2dd9d758 omudpspoof: add action parameter for mtu size 2012-12-18 09:18:15 +01:00
Rainer Gerhards
6b0e4a4422 doc: document v7 omudpspoof config parameters 2012-12-17 18:36:19 +01:00
Rainer Gerhards
5eb09df8fe doc: mention omudpspoof message size limits 2012-12-17 14:46:31 +01:00
Rainer Gerhards
06764f3bed prepare for 7.2.4 2012-12-07 15:12:04 +01:00
Rainer Gerhards
7b05ede891 doc: improve imptcp doc 2012-11-26 07:45:57 +01:00
Rainer Gerhards
91566b360f Merge branch 'v6-stable' into tmp 2012-11-22 10:43:44 +01:00
Rainer Gerhards
84a5d7b138 Merge branch 'v5-stable' into v6-stable
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
2012-11-22 09:45:05 +01:00
Marius Tomaschewski
f040bde7a0 imklog: added $klogParseKernelTimestamp option
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.
2012-11-21 18:15:00 +01:00
Marius Tomaschewski
318a6fb577 imklog: added $klogKeepKernelTimestamp option
When enabled, the kernel [timestamp] remains at begin of
each message, even it is used for the message time too.
2012-11-21 18:13:48 +01:00
Rainer Gerhards
2ed0f99ce2 prepare for 7.2.3 release 2012-11-21 17:49:55 +01:00
Rainer Gerhards
3cbb70651b prepare 7.2.2 release 2012-11-16 14:50:26 +01:00
Rainer Gerhards
98d4437d0e doc: describe leading space problem with "startswith" comparison 2012-11-14 11:07:35 +01:00
Konstantin Schmitt
21cd86bb63 doc: upgrade ruleset doc to v7 config system 2012-11-12 16:03:57 +01:00
Rainer Gerhards
7d4c434051 doc: $ActionQueueDiscardSeverity had wrong default documented
The doc contained a previous default, which has been changed in
the mean time.
2012-11-08 18:07:48 +01:00
Milan Bartos
3371348109 Added imkmsg^imklog to imkmsg documentation. 2012-11-05 12:09:13 +01:00
Rainer Gerhards
ad1b93df8a bugfix: omfwd did not properly support "template" parameter
We also added a testbench test to check for this in the future. That
in turn required new testbench tools.
2012-10-30 13:06:20 +01:00
Rainer Gerhards
c7a4fbcc0a prepare for 7.2.1 release 2012-10-29 15:50:06 +01:00
Rainer Gerhards
589744bc57 Merge branch 'v6-stable' into v7-stable 2012-10-25 18:31:32 +02:00
Michael Biebl
02bc178cc2 doc: fix html formatting 2012-10-25 18:31:08 +02:00
Rainer Gerhards
c72a43d280 make rsyslog core suspened actions after 10 failures in a row
This was former the case after 1,000 failures and could cause rsyslog
to be spammed/ressou
2012-10-24 13:00:38 +02:00
Rainer Gerhards
6bfc397b09 preparing for 6.6.0 2012-10-22 12:20:18 +02:00
Rainer Gerhards
163acd9d9f Merge branch 'v6-beta' into v6-stable 2012-10-22 11:41:23 +02:00
Rainer Gerhards
95fefbc12a prepare for 7.20 stable release & minor things
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.
2012-10-22 11:21:01 +02:00
Rainer Gerhards
ff9ad0de55 Merge branch 'v6-stable' into beta 2012-10-22 09:15:41 +02:00
Rainer Gerhards
bee73d2d93 Merge branch 'v5-stable' into v6-stable 2012-10-22 09:12:06 +02:00
Rainer Gerhards
6569ae456b doc: v3 compatibility doc lists invalid config directive
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365
2012-10-22 09:11:30 +02:00
Rainer Gerhards
9a9c88a31a preparing for 7.1.12 release 2012-10-18 14:34:54 +02:00
Rainer Gerhards
1e4ca69052 preparing for 5.10.1 2012-10-17 16:48:50 +02:00
Rainer Gerhards
9cfb0aee7d prepare for version 7.1.11 2012-10-16 15:45:21 +02:00
Rainer Gerhards
2ae9e456db add deprecated note to discard action 2012-10-11 15:36:55 +02:00
Rainer Gerhards
e21184cb28 preparing for 7.1.10 release 2012-10-11 14:42:08 +02:00
Rainer Gerhards
92c185ccfa preparing for 6.5.1 release 2012-10-11 10:56:01 +02:00
Rainer Gerhards
1cddc1c360 prepare for 7.1.9 release 2012-10-09 15:38:37 +02:00
Rainer Gerhards
1b6ba3cfcb doc: add missing files to distribution tarball
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 08:04:56 +02:00
Rainer Gerhards
83de403d50 Merge branch 'v6-stable' into beta 2012-10-04 07:48:27 +02:00
Rainer Gerhards
c8cf7313a1 Merge branch 'v6-stable' into v6-devel 2012-10-04 07:47:39 +02:00
Rainer Gerhards
5ac39a6207 doc: add missing files to distribution tarball
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 07:46:31 +02:00
Rainer Gerhards
df90450d96 prepare for 7.1.8 release 2012-10-02 17:59:59 +02:00
Florian Riedl
1269e9598d doc: update module doc to new capabilities 2012-10-02 11:16:21 +02:00
Rainer Gerhards
b5be2270e0 preparing for 7.1.7 release 2012-10-01 17:54:10 +02:00
Tim Eifler
819c816741 doc: add SQL-template example 2012-10-01 12:17:47 +02:00
Rainer Gerhards
cdd6328d1f preparing for 7.1.6 release 2012-09-28 14:57:59 +02:00
Rainer Gerhards
93cbf964ea Merge branch 'v6-devel' 2012-09-28 08:25:13 +02:00
Florian Riedl
cf0fd87e17 doc: update module doc to new config format 2012-09-28 08:24:13 +02:00
Rainer Gerhards
4cc23e9dc9 preparing for 7.1.5 2012-09-26 11:28:20 +02:00
Rainer Gerhards
e2aa96db65 Merge remote-tracking branch 'milan/imkmsg' 2012-09-24 11:51:25 +02:00
Rainer Gerhards
21a11ecb55 doc: Improve template system doc 2012-09-24 11:36:51 +02:00
Milan Bartos
c8fc40bf33 Documentation for new imkmsg module
new file:   doc/imkmsg.html
2012-09-24 08:45:33 +02:00