summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
|
* refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-237-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-develRainer Gerhards2012-01-181-15/+41
|\
| * imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| |
| * imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| |
| * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| |\
* | \ Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-173-17/+294
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| | | | | | | | | | | | | | | | email conversation Nathan/Rainer 2012-01-16&17
| * | | add elasticsearch output moduleNathan Scott2012-01-172-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 updateRainer Gerhards2012-01-161-17/+16
| | |
* | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-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-develRainer Gerhards2012-01-1617-276/+240
|\ \ \ | | |/ | |/| | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1617-276/+240
| |\| | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1416-252/+226
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | | * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | | |
| | | * relicense parts under ASL 2.0Rainer Gerhards2012-01-1112-186/+168
| | | | | | | | | | | | | | | | after carful check for copyright holder
| | * | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| | | |
* | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
| | | | | | | | | | | | | | | | probably caused by a recent merge, was not present in 5.9.4
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-091-94/+86
|\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | imudp: added per-listner stats settings & more refactoringRainer Gerhards2012-01-091-74/+80
| | | |
| * | | imudp refactor: field renaming (new names more more sense)Rainer Gerhards2012-01-091-20/+19
| | | |
| * | | imudp refactor: regression fixRainer Gerhards2012-01-091-3/+3
| | | |
| * | | imudp refactor: fixed socket leakRainer Gerhards2012-01-091-9/+5
| | | |
| * | | nit fixed (testing aid removed)Rainer Gerhards2012-01-081-2/+1
| | | |
| * | | cleanup of imudp to use better lstn data structure (part I)Rainer Gerhards2012-01-081-68/+60
| | | |
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-9/+9
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2011-12-201-2/+5
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-201-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-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
| |/ /
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-3/+1
| |\|
| | * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-3/+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.
* | | 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
| * | 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 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
|\| |
| * | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | |
* | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | 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
* | | 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 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