summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* added mmjsonparse to support recognizing and parsing JSON enhanced syslog ↵Rainer Gerhards2012-02-212-0/+255
| | | | messages
* omsnmp: support for new config system added & some refactoringRainer Gerhards2012-02-081-100/+145
|
* Merge branch 'v6-stable'Rainer Gerhards2012-02-031-16/+14
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| | |\
| | | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| | | | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | | upgraded omlibdbi to support the new v6 config formatRainer Gerhards2012-02-021-2/+82
| | | |
* | | | ommysql: added support for v6 config formatRainer Gerhards2012-02-021-0/+98
| | | |
* | | | omsnmp: fixing compile problemRainer Gerhards2012-02-011-3/+2
| | | |
* | | | omgssapi: fix compile errorsRainer Gerhards2012-02-011-9/+2
| | | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-02-011-4/+4
|\| | |
| * | | omgssapi: made recompile againRainer Gerhards2012-02-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change.
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-273-31/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-273-31/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-31/+35
| | |\|
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+6
| | | | | | | | | | | | | | | | configured
| | | * licensing changeRainer Gerhards2012-01-212-31/+29
| | | |
* | | | omprog: added support for v6 config systemRainer Gerhards2012-01-271-0/+67
| | | |
* | | | cleanup: remove omdbalertingRainer Gerhards2012-01-272-154/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | someone claimed to write a module with this functionality, if a template were provided. And indeed, it was provided but never anything happend (at least nothing was contributed back...). Removing this silly template now. If someone really intends to take up on it, get a copy from older git versions.
* | | | 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