Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imklog: forgot to remove one file; now done | Rainer Gerhards | 2012-01-23 | 1 | -35/+0 |
| | |||||
* | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 7 | -2063/+170 |
| | | | | | | | The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver. | ||||
* | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 |
|\ | |||||
| * | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 |
| | | |||||
| * | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 |
| | | |||||
| * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| |\ | |||||
* | \ | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 3 | -17/+294 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| * | | | elasticsearch: move to asl 2.0 | Rainer Gerhards | 2012-01-17 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | email conversation Nathan/Rainer 2012-01-16&17 | ||||
| * | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 2 | -0/+279 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for sending events to elasticsearch - a distributed, RESTful, search engine built on Lucene (www.elasticsearch.org). The output module is enabled via a configure option, and uses libcurl to send the messages from rsyslog to elasticsearch. This patch makes use of the earlier JSON quoting patch to ensure valid JSON strings are sent to the server. Signed-off-by: Nathan Scott <nathans@aconex.com> | ||||
| * | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | | | |||||
* | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0 | Rainer Gerhards | 2012-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-) | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 17 | -276/+240 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: plugins/imtcp/imtcp.c | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 17 | -276/+240 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 16 | -252/+226 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| | | * | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | | | | |||||
| | | * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 12 | -186/+168 |
| | | | | | | | | | | | | | | | | after carful check for copyright holder | ||||
| | * | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | | | | |||||
* | | | | regression fix: imuxsock-received messages were malformed | Rainer Gerhards | 2012-01-12 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | probably caused by a recent merge, was not present in 5.9.4 | ||||
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -94/+86 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | imudp: added per-listner stats settings & more refactoring | Rainer Gerhards | 2012-01-09 | 1 | -74/+80 |
| | | | | |||||
| * | | | imudp refactor: field renaming (new names more more sense) | Rainer Gerhards | 2012-01-09 | 1 | -20/+19 |
| | | | | |||||
| * | | | imudp refactor: regression fix | Rainer Gerhards | 2012-01-09 | 1 | -3/+3 |
| | | | | |||||
| * | | | imudp refactor: fixed socket leak | Rainer Gerhards | 2012-01-09 | 1 | -9/+5 |
| | | | | |||||
| * | | | nit fixed (testing aid removed) | Rainer Gerhards | 2012-01-08 | 1 | -2/+1 |
| | | | | |||||
| * | | | cleanup of imudp to use better lstn data structure (part I) | Rainer Gerhards | 2012-01-08 | 1 | -68/+60 |
| | | | | |||||
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 1 | -9/+9 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| * | | | 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 |