summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-238-2105/+176
|\ | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c
| * 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.
* | cosmetic: remove compiler warningsRainer Gerhards2012-01-192-2/+2
| |
* | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-1913-38/+26
| |
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-1926-165/+165
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * | undoing v6.1 config scoping interface, part II (now finished)Rainer Gerhards2012-01-1915-65/+65
| | | | | | | | | | | | | | | | | | This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
| * | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-1813-92/+92
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-17/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1417-276/+240
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-185-72/+417
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * | | | | 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>
| * | | | | | $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
| * | | | | | 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' into masterRainer Gerhards2012-01-1818-293/+257
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | | | | licensing updateRainer Gerhards2012-01-161-17/+16
| | |_|/ / / | |/| | | |
| * | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-094-715/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-9/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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-devel'Rainer Gerhards2011-12-192-1/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | 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
| | |/ / /
| * | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-5/+161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | 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
generated by cgit (git 2.34.1) at 2024-05-07 20:40:25 +0000