summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-112-0/+441
| |\ \ \ \ \
| * | | | | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-031-2/+7
| |\ \ \ \ \ \
* | | | | | | | step: imklog (linux) moved to v2 config systemRainer Gerhards2011-05-255-112/+188
| | | | | | | |
* | | | | | | | step: imptcp ported to v2 config systemRainer Gerhards2011-05-231-70/+182
| | | | | | | |
* | | | | | | | implemented support for v2 config system in imrelpRainer Gerhards2011-05-211-37/+92
| | | | | | | |
* | | | | | | | Merge branch 'beta'Rainer Gerhards2011-05-214-5/+435
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c
| * \ \ \ \ \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-05-204-5/+435
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
| | * | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-201-5/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | cleanup: removed useless & undocumented config directive from imrelpRainer Gerhards2011-05-201-5/+0
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | omlibdbi: added necessary includeRainer Gerhards2011-05-121-0/+1
| | | | | | | |
| | * | | | | | mmsnmptrapd: removed unnecessary includesRainer Gerhards2011-05-121-3/+0
| | | |_|_|/ / | | |/| | | |
| | * | | | | undo accidental removal of a componentRainer Gerhards2011-05-101-0/+6
| | | | | | |
| | * | | | | mmsnmptrapd: added doc & mentioned in ChangeLogRainer Gerhards2011-05-101-6/+0
| | | | | | |
| | * | | | | cosmetic cleanupRainer Gerhards2011-05-091-2/+0
| | | | | | |
| | * | | | | mmsnmptrapd: added capability to specify severity mappingRainer Gerhards2011-05-091-2/+154
| | | | | | |
| | * | | | | mmsnmptrap: added TAG processingRainer Gerhards2011-05-061-1/+77
| | | | | | |
| | * | | | | added skeleton for mmsnmptrapdRainer Gerhards2011-05-052-0/+215
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-091-2/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
* | | | | | imfile is being totally refactored -- add new conf system when doneRainer Gerhards2011-05-201-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | otherwise we may waste a lot of effort...
* | | | | | move impstats to new config interfaceRainer Gerhards2011-05-201-14/+32
| | | | | |
* | | | | | step: imuxsock changed to new config systemRainer Gerhards2011-05-121-143/+249
| | | | | | | | | | | | | | | | | | | | | | | | now also properly works with privilege drop
* | | | | | imttcp: will not be upgraded to v2 config systemRainer Gerhards2011-05-121-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was an experimental module which did not work out well, so there is no point in enhancing it.
* | | | | | step: imtcp did not properly handle privilege dropRainer Gerhards2011-05-061-5/+1
| | | | | |
* | | | | | step: conf interface now natively supports priv dropRainer Gerhards2011-05-062-4/+18
| | | | | |
* | | | | | step: generalized new config interface for all module typesRainer Gerhards2011-05-067-0/+11
| | | | | |
* | | | | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-0515-137/+202
| | | | | | | | | | | | | | | | | | | | | | | | as far as we know that new interface right now ;)
* | | | | | step: imudp utilizes interim new input module interfaceRainer Gerhards2011-05-041-162/+266
| | | | | |
* | | | | | step: small improvements to input mod config plumbingRainer Gerhards2011-05-031-3/+0
| | | | | |
* | | | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-0315-12/+466
| | | | | |
* | | | | | Merge branch 'v5-stable'Rainer Gerhards2011-04-271-2/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | bugfix: rate-limiting inside imuxsock did not work 100% correctRainer Gerhards2011-04-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason was that a global config variable was invalidly accessed where a listener variable should have been used. Also performance-improved the case when rate limiting is turned off (this is a very unintrusive change, thus done directly to the stable version).
* | | | | | minor: some better debug instrumentationRainer Gerhards2011-04-271-1/+1
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-261-4/+20
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
| * | | | | Merge branch 'v5-devel-systemd-pri' into v5-develRainer Gerhards2011-04-191-4/+20
| |\ \ \ \ \
| | * | | | | experimental: support for systemd-induced second PRI in klogRainer Gerhards2011-03-181-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if systemd writes a kernel log entry with a non-kernel priority, the priority recorded in the kernel log will be wrong. However, it will be immediately followed by another priority (with the kernel timestamp in between, if enabled). So imklog now tries to see if there is a second PRI and, if so, uses it. Note that we already support non-kernel PRIs in the kernel log, as this was done in BSD for quite some while. HOWEVER the config statement "$klogpermitnonkernelfacility on" must be used to permit this (otherwise non kernel messages are dropped). Sample of a such a message on a kernel without timestamping enabled: $ echo '<14>text' > /dev/kmsg $ dmesg -r <4><14>text NOTE: support for timestamp is NOT YET ENABLED!
* | | | | | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-196-6/+6
| | | | | | |