summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* im3195: object was not freed on exit [ASL2.0]Martin Körper2013-01-081-0/+1
| | | | | This and the other patch from Martin (this morning) was released under ASL 2.0 by him.
* bugfix: mmjsonparse errornously returned action error when no CEE cookie was ↵Rainer Gerhards2013-01-081-0/+1
| | | | present.
* bugfix: compile errors in im3195Martin Körper2013-01-081-1/+14
|
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-12-171-0/+6
|\ | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-171-1/+7
| |\
| | * bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size)Rainer Gerhards2012-12-171-1/+7
| | | | | | | | | | | | | | | it now truncates these message, but ensures they are sent. Note that 7.2.5+ will switch to fragmented UDP messages instead (up to 64K)
* | | omudpspoof: better debug outputRainer Gerhards2012-12-171-10/+14
| | |
* | | add extra debug info to tackle omudpspoof problemRainer Gerhards2012-12-171-0/+1
| | |
* | | build: link omelasticsearch against -lmMichael Biebl2012-12-131-1/+1
| | | | | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow().
* | | permit RFC3339 timestamp in local log socket messagesSebastien Ponce2012-12-031-3/+7
| | | | | | | | | | | | Released under ASL 2.0, permission given via email.
* | | silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-282-3/+12
| | |
* | | bugfix: modules not (yet) supporting new conf format were not properly ↵Rainer Gerhards2012-11-289-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | registered This lead to a "module not found" error message instead of the to-be-expected "module does not support new style" error message. That invalid error message could be quite misleading and actually stop people from addressing the real problem (aka "go nuts" ;))
* | | bugfix: supportoctetcountedframing parameter did not work in imptcpRainer Gerhards2012-11-251-1/+1
| | |
* | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-223-25/+49
|\| |
| * | imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | | | | | | | | | | | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge).
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-223-25/+43
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-221-12/+12
| | | | | | | | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea.
| | * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-213-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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 optionMarius Tomaschewski2012-11-213-2/+8
| | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too.
* | | minor cleanupRainer Gerhards2012-11-151-8/+0
| | |
* | | silence compiler warnings & some cleanupRainer Gerhards2012-11-141-5/+1
| | |
* | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-0/+7
| | | | | | | | | | | | | | | | | | | | | This is not a real problem (thus no ChangeLog entry): we leaked a few bytes for every relp listener, but only at rsyslogd TERMINATION - where obviously the OS does the cleanup. However, the leak could cause some confusion with memory checkers like valgrind.
* | | bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-141-0/+2
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-131-1/+1
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-131-1/+1
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
| | |
* | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-021-3/+3
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-018-8/+8
|\| |
| * | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-8/+8
| | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-011-1/+1
|\| |
| * | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-011-1/+1
| | | | | | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started.
| * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-2/+2
| |\ \
| * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-5/+0
| |\ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-161-8/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-6/+0
| |\ \ \ \ \ \ \
* | | | | | | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-301-2/+4
| | | | | | | | |
* | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-241-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
* | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * | | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
|\| | | | | | |
| * | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
|\| | | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | | |
| | * | | | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | | |