Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | bugfix: IPv6-address could not be specified in omrelp | Rainer Gerhards | 2011-04-14 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 | ||||
| * | | | | sm_cust_bindcdr: updated field mapping according to spec received today | Rainer Gerhards | 2011-04-15 | 1 | -3/+11 |
| | | | | | |||||
| * | | | | bugfix: doc for impstats had wrong config statements | Rainer Gerhards | 2011-04-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem. | ||||
* | | | | | added new config directive $InputTCPFlowControl... | Rainer Gerhards | 2011-04-01 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not. | ||||
* | | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2011-03-31 | 4 | -2/+398 |
|\| | | | | |_|/ / |/| | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | fixed problem in testbench & added new test (not yet integrated) | Rainer Gerhards | 2011-03-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241 | ||||
| * | | | Force ANSI SQL treatment of strings for Postgres | Christian Kastner | 2011-03-29 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | did mapping of data items to database table columns | Rainer Gerhards | 2011-03-29 | 1 | -14/+9 |
| | | | | | | | | | | | | | | | | to facilitate testing | ||||
| * | | | sm_cust_bindcdr: custom date parsing added | Rainer Gerhards | 2011-03-28 | 1 | -10/+90 |
| | | | | |||||
| * | | | sm_bind_cdr: added capability to configure "allowed IPs" | Rainer Gerhards | 2011-03-22 | 1 | -3/+80 |
| | | | | |||||
| * | | | added internal processing of BIND records | Rainer Gerhards | 2011-03-22 | 1 | -6/+115 |
| | | | | | | | | | | | | | | | | | | | | still some questions outstanding, so actual SQL statement is not usable at the moment | ||||
| * | | | bugfix: strgen could not be used together with database outputs | Rainer Gerhards | 2011-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195 | ||||
| * | | | setup test environment and test code in order to look at... | Rainer Gerhards | 2011-03-17 | 1 | -31/+14 |
| | | | | | | | | | | | | | | | | | | | | bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases | ||||
| * | | | prepared skeleton for new strgen module | Rainer Gerhards | 2011-03-17 | 2 | -0/+144 |
| | | | | |||||
| * | | | backporting patch for clean make distcheck | Rainer Gerhards | 2011-03-16 | 2 | -0/+11 |
| | | | | |||||
* | | | | fixing cosmetic memory leak in imdiag, imfile | Rainer Gerhards | 2011-03-14 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench. |