summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* ommongodb: milestone:refactored to use libmongo-clientRainer Gerhards2012-03-122-82/+53
| | | | which is waaaaaaay better than the 10gen client driver
* ommongodb: made ommongodb compile on current rsyslog versionRainer Gerhards2012-03-072-24/+20
|
* ommongodb: adding ASL 2.0 license headerRainer Gerhards2012-03-071-0/+21
| | | | | after clarifying and receiving permission to do so with original contributor Victor Pereira (email exchange on 2011-02-22)
* milestone: properly parsing raw audit logsRainer Gerhards2012-03-021-2/+13
|
* mmauditd: moved to changed libee 0.4.2 APIRainer Gerhards2012-03-021-6/+3
|
* Merge branch 'v6-stable'Rainer Gerhards2012-03-021-1/+4
|\ | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-021-2/+5
| |\
| | * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| | | | | | | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
* | | screwed up during merge - solving that mess ;)Rainer Gerhards2012-03-011-65/+6
| | |
* | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-0/+68
|\| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-0/+9
| |\|
| | * Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
| | | | | | | | | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-2/+2
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-2/+2
| |\|
| | * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | | milestone: parsing audit message almost correctRainer Gerhards2012-02-241-9/+133
| | |
* | | mmaudit: added skeleton (copy of mmjsonparse)Rainer Gerhards2012-02-232-0/+263
| | |
* | | mmjsonparse: changed cookie back to @cee: after discussion with BalabitRainer Gerhards2012-02-221-1/+1
| | |
* | | 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
| |\ \ \ \ \ \