Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | |||||
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 | |
|\| | | | ||||||
| * | | | imudp: stats added | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 | |
| | | | | ||||||
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -3/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c | |||||
| * | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 1 | -3/+1 | |
| |\| | ||||||
| | * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 1 | -3/+1 | |
| | | | ||||||
* | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition. | |||||
* | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -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-devel | Rainer Gerhards | 2011-10-17 | 1 | -2/+2 | |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -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 v5-devel | Rainer Gerhards | 2011-09-07 | 1 | -4/+9 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c | |||||
| * | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -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-devel | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 | |
|\| | | ||||||
| * | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-05 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | doc: cleanup of copy-and-paste error in comment | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | thanks to darix for alerting me | |||||
| * | | reduced sporadic failures during make check | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 | |
| | | | | | | | | | | | | backport from v6 | |||||
* | | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -3/+0 | |
| | | | ||||||
* | | | backported patch for testbench race reduction | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 | |
| | | | ||||||
* | | | added support for obtaining timestamp for kernel message from message | Rainer Gerhards | 2011-06-24 | 5 | -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 imuxsock | Rainer Gerhards | 2011-06-20 | 1 | -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-devel | Rainer Gerhards | 2011-06-06 | 3 | -4/+23 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 1 | -1/+10 | |
| | | | | ||||||
| * | | | enhanced imfile to support input batching | Rainer Gerhards | 2011-05-24 | 1 | -1/+13 | |
| |/ / | ||||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| |\ \ | ||||||
| * | | | omlibdbi: added necessary include | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | mmsnmptrapd: removed unnecessary includes | Rainer Gerhards | 2011-05-12 | 1 | -3/+0 | |
| | | | | ||||||
* | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | cleanup: removed useless & undocumented config directive from imrelp | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| | | | | ||||||
| * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 2 | -3/+13 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | |||||
* | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handler | Rainer Gerhards | 2011-05-13 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | added support to control KEEPALIVE settings in imptcp | Rainer Gerhards | 2011-05-13 | 1 | -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 layer | Rainer Gerhards | 2011-05-11 | 1 | -4/+37 | |
| | | | | ||||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-11 | 2 | -0/+441 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | undo accidental removal of a component | Rainer Gerhards | 2011-05-10 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 1 | -6/+0 | |
| | | | | ||||||
| * | | | cosmetic cleanup | Rainer Gerhards | 2011-05-09 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | mmsnmptrapd: added capability to specify severity mapping | Rainer Gerhards | 2011-05-09 | 1 | -2/+154 | |
| | | | | ||||||
| * | | | mmsnmptrap: added TAG processing | Rainer Gerhards | 2011-05-06 | 1 | -1/+77 | |
| | | | | ||||||
| * | | | added skeleton for mmsnmptrapd | Rainer Gerhards | 2011-05-05 | 2 | -0/+215 | |
| | | | | ||||||
* | | | | added capability for imtcp to activate keep-alive packets | Rainer Gerhards | 2011-05-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html | |||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-03 | 1 | -2/+7 | |
|\| | | | ||||||
| * | | | bugfix: rate-limiting inside imuxsock did not work 100% correct | Rainer Gerhards | 2011-04-27 | 1 | -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). | |||||
* | | | | Merge branch 'v5-devel-systemd-pri' into v5-devel | Rainer Gerhards | 2011-04-19 | 1 | -4/+20 | |
|\ \ \ \ | ||||||
| * | | | | experimental: support for systemd-induced second PRI in klog | Rainer Gerhards | 2011-03-18 | 1 | -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! | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 | |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-04-15 | 1 | -2/+12 | |
| |\ \ \ \ | | | |_|/ | | |/| | |