summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-12-192-1/+18
|\ | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+17
| |\
| | * imudp: stats addedRainer Gerhards2011-12-191-0/+17
| | |
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+1
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * added instrumentationRainer Gerhards2011-12-191-1/+1
| | |
| * | new stats counter "discarded" for queue objectRainer Gerhards2011-12-161-1/+1
| | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-5/+161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-6/+157
| | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd.
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-2/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ Merge branch 'beta'Rainer Gerhards2011-12-161-3/+1
|\ \ \ \
| * \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-12-161-3/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-3/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-3/+1
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2011-10-171-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-5/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-4/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-4/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-311-0/+1
| |\| | |
| * | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-301-3/+0
| | | | | |
| * | | | | backported patch for testbench race reductionRainer Gerhards2011-06-301-9/+14
| | | | | |
* | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-082-14/+50
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2011-08-311-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: action.c
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-9/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
* | | | | | somewhat more informative imklog status messages (mostly cosmetic)Rainer Gerhards2011-08-051-2/+4
| | | | | |
* | | | | | mostly cosmetic: error message did incorrectly contain errno-infoRainer Gerhards2011-08-051-1/+1
| | | | | |
* | | | | | - imudp&imtcp now report error if no listener at all was definedRainer Gerhards2011-08-052-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message
* | | | | | milestone: added module config namesRainer Gerhards2011-07-2041-1/+42
| | | | | |
* | | | | | Merge branch 'v5-stable'Rainer Gerhards2011-07-131-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
| | |/ / / | |/| | | | | | | | | | | | | thanks to darix for alerting me
| * | | | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
| | | | | | | | | | | | | | | | | | | | backport from v6
* | | | | reduced sporadic failures during make checkRainer Gerhards2011-06-271-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the imdiag implementation of "queue empty" was a bit racy, which sometimes lead to too-early termination of rsyslogd and thus some small memory leaks (which in turn showed up as problems during make check). The current architecture is not able to 100% guard against this, but the probleme probability has been reduced (and it showed to improve in practice).
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-2710-121/+329
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-245-99/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation.
| * | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-201-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permits to read the time a message was submitted to the system log socket. Most importantly, this is provided in microsecond resolution. So we are able to obtain high precision timestampis even for messages that were - as is usual - not formatted with them. This also simplifies things in regard to local time calculation in chroot environments. Many thanks to Lennart Poettering for suggesting this feature, providing some guidance on implementing it and coordinating getting the necessary support into the Linux kernel.
| * | | | Merge branch 'v5-stable-imfile-batches' into v5-develRainer Gerhards2011-06-063-4/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | imfile: added $InputFileMaxLinesAtOnce directiveRainer Gerhards2011-05-241-1/+10
| | | | | |
| | * | | | enhanced imfile to support input batchingRainer Gerhards2011-05-241-1/+13
| | |/ / /
| * | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| | |\ \ \
| | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-3/+13
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| * | | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handlerRainer Gerhards2011-05-131-1/+1
| | | | | | |
| * | | | | | added support to control KEEPALIVE settings in imptcpRainer Gerhards2011-05-131-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this has not yet been added to imtcp, but could be done on request
| * | | | | | imptcp: added capability to activate keep-alive at socket layerRainer Gerhards2011-05-111-4/+37
| | | | | | |