Rainer Gerhards
ad9d197649
design: draft lookup table functionality
2013-01-17 13:02:03 +01:00
Rainer Gerhards
29e8c99a7a
Merge branch 'v7-stable-libnet-frag'
...
Conflicts:
ChangeLog
2013-01-14 08:42:51 +01:00
Rainer Gerhards
17d48fc499
added capability to output thread-id-to-function debug info
...
This is a useful debug aid, but nothing of concern for regular users.
2013-01-13 12:14:58 +01:00
Rainer Gerhards
3d5c805ab6
doc bugfix: invalid parser name
...
Thanks to Nathan Stratton Treadway for alerting me.
2013-01-13 11:13:44 +01:00
Rainer Gerhards
f373968c66
Merge branch 'v7-stable-libnet-frag'
...
Conflicts:
ChangeLog
configure.ac
tools/omfile.c
2013-01-11 09:39:27 +01:00
Rainer Gerhards
77737e8ab2
impstats: added ability to write stats records to local file
...
...and avoid going through the syslog log stream. syslog logging can now
also be turned off (see doc for details).
2013-01-10 16:37:59 +01:00
Rainer Gerhards
dcf3e76319
Merge branch 'v7-stable' into v7-stable-libnet-frag
...
Conflicts:
ChangeLog
configure.ac
2013-01-09 09:16:50 +01:00
Rainer Gerhards
55d6eef1be
prepare for 7.2.5 release
2013-01-08 15:26:32 +01:00
Rainer Gerhards
9abe47d022
preparing for 7.3.5 release
2012-12-18 14:47:40 +01:00
Rainer Gerhards
66dcd68d62
Merge branch 'v7-stable-libnet-frag'
...
Conflicts:
configure.ac
plugins/impstats/impstats.c
plugins/omudpspoof/omudpspoof.c
runtime/rsyslog.h
2012-12-18 12:01:52 +01:00
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
Florian Riedl
40daa5ef04
doc bugfix: corrections and improvements in mmnormalize html doc page
2012-11-29 12:46:25 +01:00
Rainer Gerhards
5e863f50de
bugfix: no error message for invalid string template parameters
...
rather a malformed template was generated, and error information emitted
at runtime. However, this could be quite confusing. Note that with this
"bugfix" user experience changes: formerly, rsyslog and the affected
actions properly started up, but the actions did not produce proper
data. Now, there are startup error messages and the actions are NOT
executed (due to missing template due to template error).
2012-11-29 11:21:09 +01:00
Rainer Gerhards
e581c3d26e
Merge branch 'v7-stable'
...
Conflicts:
doc/imptcp.html
plugins/mmjsonparse/mmjsonparse.c
plugins/mmnormalize/mmnormalize.c
2012-11-28 10:19:29 +01:00
Rainer Gerhards
7b05ede891
doc: improve imptcp doc
2012-11-26 07:45:57 +01:00
Rainer Gerhards
7893c9b19d
prepare 7.3.4 release
2012-11-25 17:03:19 +01:00
Marius Tomaschewski
791f7ddcfc
doc: add new options to imklog doc page
2012-11-22 11:19:12 +01:00
Rainer Gerhards
42cd1fa7d7
Merge branch 'v7-stable'
...
Conflicts:
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/bsd.c
plugins/imklog/imklog.c
plugins/imklog/imklog.h
2012-11-22 11:05:45 +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
eb659a82de
Merge branch 'v7-stable'
2012-11-14 17:48:35 +01:00
Rainer Gerhards
98d4437d0e
doc: describe leading space problem with "startswith" comparison
2012-11-14 11:07:35 +01:00
Rainer Gerhards
62ab1c20b3
Merge branch 'v7-stable'
2012-11-13 16:32:33 +01:00
Konstantin Schmitt
21cd86bb63
doc: upgrade ruleset doc to v7 config system
2012-11-12 16:03:57 +01:00
Rainer Gerhards
0df3ec66bd
Merge branch 'v7-stable'
2012-11-08 18:08:49 +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
Rainer Gerhards
7ab0af28e7
Merge branch 'v7-stable'
2012-11-08 18:03:42 +01:00
Rainer Gerhards
3c71347aa6
prepare for 7.3.3 release
2012-11-07 12:14:00 +01:00
Rainer Gerhards
28047567a2
doc: improve ommongodb doc
2012-11-06 12:08:09 +01:00
Milan Bartos
3371348109
Added imkmsg^imklog to imkmsg documentation.
2012-11-05 12:09:13 +01:00
Rainer Gerhards
581a11a103
doc: add module doc for mmjsonparse
2012-11-01 18:22:32 +01:00
Rainer Gerhards
dca7537f94
typo fix
2012-11-01 18:14:13 +01:00
Rainer Gerhards
19354af62c
mmnormalize: support for v6+ config interface added
2012-11-01 18:12:26 +01:00
Rainer Gerhards
20c57a6d70
prepare for 7.3.2 release
2012-10-30 16:05:55 +01:00
Rainer Gerhards
e711dc6e6b
Merge branch 'master-ratelimit'
2012-10-30 14:59:01 +01:00
Rainer Gerhards
7faeff73dd
Merge branch 'v7-stable'
...
Conflicts:
configure.ac
doc/manual.html
2012-10-30 13:12:39 +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
fac3c09f04
Merge branch 'v7-stable'
2012-10-27 14:50:06 +02: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
