summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'tmp'Rainer Gerhards2013-06-171-3/+3
|\ | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-171-3/+3
| | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-0/+4
|\ \
| * | imjournal: add legacy config statement for ratelimitingRainer Gerhards2013-06-151-0/+4
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-8/+23
|\| |
| * | imjournal: add ratelimiting capabilityRainer Gerhards2013-06-151-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original imjournal code did not support ratelimiting at all. We now have our own ratelimiter. This can mitigate against journal database corruption, when the journal re-sends old data. This is a current bug in systemd journal, but we won't outrule this to happen in the future again. So it is better to have a safeguard in place. By default, we permit 20,000 messages witin 10 minutes. This may be a bit restrictive, but given the risk potential it seems reasonable. Users requiring larger traffic flows can always adjust the value.
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-12/+31
|\| |
| * | bugfix: prevent a segfault if state file is not definedTomas Heinrich2013-06-141-12/+31
| | |
* | | cleanupRainer Gerhards2013-06-141-1/+0
| | |
* | | [io]mrelp: support for certificate parametersRainer Gerhards2013-06-132-0/+46
| | |
* | | omrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-122-1/+10
| | |
* | | imrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-121-0/+6
| | |
* | | imrelp: new parameter "compression.dhbits"Rainer Gerhards2013-06-121-0/+8
| | | | | | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation
* | | Merge branch 'master-tcp-compress-stream'Rainer Gerhards2013-06-121-12/+167
|\ \ \
| * \ \ Merge branch 'master' into master-tcp-compress-streamRainer Gerhards2013-05-076-43/+658
| |\ \ \
| * | | | tcp strm compression: add stats countersRainer Gerhards2013-04-181-5/+23
| | | | |
| * | | | tcp strm compression: add config parametersRainer Gerhards2013-04-181-6/+39
| | | | |
| * | | | tcp strm compression: first PoCRainer Gerhards2013-04-181-10/+114
| | | | | | | | | | | | | | | | | | | | NOT to be used for production, lots of things are missing
* | | | | Merge branch 'master-mmfields'Rainer Gerhards2013-06-112-0/+273
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac
| * | | | | mmfields: store parsed-out fields in rsyslog dictionaryRainer Gerhards2013-06-091-2/+13
| | | | | |
| * | | | | mmfields/milestone: fields properly extractedRainer Gerhards2013-06-071-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | but not yet stored in rsyslog dictionary
| * | | | | mmfields: created skeleton for new module; build system integrationRainer Gerhards2013-06-072-0/+216
| | | | | |
* | | | | | imuxsock: don't report an error message for $OmitLocalLoggingTomas Heinrich2013-06-101-0/+4
| | | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-102-14/+65
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | bugfix: be more tolerant to malformed journal fieldsTomas Heinrich2013-06-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a segfault when a malformed journal entry field doesn't contain an equal sign. Should not ever happen but was actually triggered by a real bug in systemd journal.
| * | | | | bugfix imzmq3: potential segfault on startupHongfei Cheng2013-06-061-13/+57
| | |_|_|/ | |/| | | | | | | | | | | | | if no problem happend at startup, everything went fine
* | | | | imrelp: implement "ruleset" module parameterRainer Gerhards2013-06-101-5/+56
| | | | |
* | | | | mmcount: message modification plugin which counts messagesBala.FA2013-06-092-0/+350
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module provides the capability to count log messages by severity or json property of given app-name. The count value is added into the log message as json property named 'mmcount' Example usage of the module in the configuration file module(load="mmcount") # count each severity of appname gluster action(type="mmcount" appname="gluster") # count each value of gf_code of appname gluster action(type="mmcount" appname="glusterd" key="!gf_code") # count value 9999 of gf_code of appname gluster action(type="mmcount" appname="glusterfsd" key="!gf_code" value="9999") # send email for every 50th mmcount if $app-name == 'glusterfsd' and $!mmcount <> 0 and $!mmcount % 50 == 0 then { $ActionMailSMTPServer smtp.example.com $ActionMailFrom rsyslog@example.com $ActionMailTo glusteradmin@example.com $template mailSubject,"50th message of gf_code=9999 on %hostname%" $template mailBody,"RSYSLOG Alert\r\nmsg='%msg%'" $ActionMailSubject mailSubject $ActionExecOnlyOnceEveryInterval 30 :ommail:;RSYSLOG_SyslogProtocol23Format } Signed-off-by: Bala.FA <barumuga@redhat.com>
* | | | [io]mrelp: add TLS compression supportRainer Gerhards2013-06-072-2/+22
| | | |
* | | | Merge branch 'nextmaster'Rainer Gerhards2013-06-062-7/+55
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: ChangeLog
| * | | omrelp: add "rebindInterval" parameterRainer Gerhards2013-05-141-5/+26
| | | |
| * | | imrelp: add support for TLSRainer Gerhards2013-05-141-5/+13
| | | |
| * | | Merge branch 'master' into nextmaster-rtlsRainer Gerhards2013-05-141-57/+0
| |\ \ \
| * | | | omrelp: add support for TLSRainer Gerhards2013-05-142-1/+16
| | | | |
| * | | | reflect librelp API changeRainer Gerhards2013-05-131-5/+5
| | | | |
| * | | | Merge branch 'master' into nextmasterRainer Gerhards2013-05-131-0/+1
| |\ \ \ \
| * | | | | Add configurable local client IPAxel Rau2013-05-061-1/+5
| | |_|_|/ | |/| | |
* | | | | 0mq fixes; credits to Hongfei Cheng and Brian KnoxRainer Gerhards2013-06-044-397/+613
| | | | |
* | | | | bugfix: postpone the start of the imgssapi listenerTomas Heinrich2013-06-031-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the listen socket is opened earlier (during configuration parsing), it is closed again during early init. The start has been postponed to the 'runInput' stage, which has an unpleasant side effect that it will fail if the priviledges are dropped. The code should be eventually fixed to support the new config system.
* | | | | bugfix: imjournal should respect termination requestTomas Heinrich2013-05-261-11/+67
| | | | | | | | | | | | | | | | | | | | | | | | | sd_journal_wait() ignores EINTR and this behavior interferes with module's termination signaling. Therefore, poll() is used instead.
* | | | | bugfix: imjournal's thread shouldn't be canceledTomas Heinrich2013-05-261-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Because of cancelation, the correct possition in the journal was lost. This resulted in duplicate messages appearing in the logs.
* | | | | Eliminate sleep in imjournal code with sd_journal_waitMilan Bartos2013-05-221-5/+6
| | | | | | | | | | | | | | | | | | | | modified: plugins/imjournal/imjournal.c
* | | | | Remove redundat cflags and links to librariesTomas Heinrich2013-05-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This prevents linking with libee, liblognorm and libgcrypt when not necessary.
* | | | | Don't #include libestr and libee headers when not necessaryTomas Heinrich2013-05-202-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Through msg.h, many unrelated components needlessly required LIBEE_CFLAGS.
* | | | | Clean up warnings in imjournal and omjournalTomas Heinrich2013-05-202-9/+14
| | | | |
* | | | | Imjournal state files can be stored in WorkDirectoryMilan2013-05-201-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the imjournal state file path doesn't start with '/', then it's by default stored in WorkDirectory. When path starts with '/', full path is used.
* | | | | Add missing pid part of syslog tag.Milan Bartos2013-05-141-3/+24
| | | | |
* | | | | Fix a condition in imjournalTomas Heinrich2013-05-141-1/+10
| |_|/ / |/| | | | | | | | | | | | | | | This prevented state file from being written with newer systemd. Add some more debug information.
* | | | omrelp: remove legacy code that was never usedRainer Gerhards2013-05-141-57/+0
| |/ / |/| | | | | | | | | | | | | | this was an artifact from the original copy from omfwd. The options were not functional and also not documented, so it is safe to simply remove them.
* | | bugfix: omrelp legacy config parameters set a timeout of zeroRainer Gerhards2013-05-131-0/+1
|/ / | | | | | | which lead the legacy config to be unusable.