| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | Merge branch 'v5-stable-imfile-batches' into v5-devel | Rainer Gerhards | 2011-06-06 | 3 | -4/+23 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| | | * | | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 1 | -1/+10 | |
| | | | | | | | ||||||
| | | * | | | | enhanced imfile to support input batching | Rainer Gerhards | 2011-05-24 | 1 | -1/+13 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 2 | -3/+13 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | |||||
| | * | | | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handler | Rainer Gerhards | 2011-05-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | added support to control KEEPALIVE settings in imptcp | Rainer Gerhards | 2011-05-13 | 1 | -2/+66 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this has not yet been added to imtcp, but could be done on request | |||||
| | * | | | | | | imptcp: added capability to activate keep-alive at socket layer | Rainer Gerhards | 2011-05-11 | 1 | -4/+37 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-11 | 2 | -0/+441 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | added capability for imtcp to activate keep-alive packets | Rainer Gerhards | 2011-05-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html | |||||
| | * | | | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-03 | 1 | -2/+7 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | step: imklog (linux) moved to v2 config system | Rainer Gerhards | 2011-05-25 | 5 | -112/+188 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | step: imptcp ported to v2 config system | Rainer Gerhards | 2011-05-23 | 1 | -70/+182 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | implemented support for v2 config system in imrelp | Rainer Gerhards | 2011-05-21 | 1 | -37/+92 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-05-21 | 4 | -5/+435 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c | |||||
| | * | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 4 | -5/+435 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | |||||
| | | * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | | * | | | | | | cleanup: removed useless & undocumented config directive from imrelp | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 | |
| | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | | omlibdbi: added necessary include | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | | * | | | | | | mmsnmptrapd: removed unnecessary includes | Rainer Gerhards | 2011-05-12 | 1 | -3/+0 | |
| | | | |_|_|/ / | | |/| | | | | ||||||
| | | * | | | | | undo accidental removal of a component | Rainer Gerhards | 2011-05-10 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| | | * | | | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 1 | -6/+0 | |
| | | | | | | | | ||||||
| | | * | | | | | cosmetic cleanup | Rainer Gerhards | 2011-05-09 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| | | * | | | | | mmsnmptrapd: added capability to specify severity mapping | Rainer Gerhards | 2011-05-09 | 1 | -2/+154 | |
| | | | | | | | | ||||||
| | | * | | | | | mmsnmptrap: added TAG processing | Rainer Gerhards | 2011-05-06 | 1 | -1/+77 | |
| | | | | | | | | ||||||
| | | * | | | | | added skeleton for mmsnmptrapd | Rainer Gerhards | 2011-05-05 | 2 | -0/+215 | |
| | | | |_|/ / | | |/| | | | ||||||
| | * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 1 | -2/+7 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c | |||||
| * | | | | | | imfile is being totally refactored -- add new conf system when done | Rainer Gerhards | 2011-05-20 | 1 | -24/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we may waste a lot of effort... | |||||
| * | | | | | | move impstats to new config interface | Rainer Gerhards | 2011-05-20 | 1 | -14/+32 | |
| | | | | | | | ||||||
| * | | | | | | step: imuxsock changed to new config system | Rainer Gerhards | 2011-05-12 | 1 | -143/+249 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | now also properly works with privilege drop | |||||
| * | | | | | | imttcp: will not be upgraded to v2 config system | Rainer Gerhards | 2011-05-12 | 1 | -24/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was an experimental module which did not work out well, so there is no point in enhancing it. | |||||
| * | | | | | | step: imtcp did not properly handle privilege drop | Rainer Gerhards | 2011-05-06 | 1 | -5/+1 | |
| | | | | | | | ||||||
| * | | | | | | step: conf interface now natively supports priv drop | Rainer Gerhards | 2011-05-06 | 2 | -4/+18 | |
| | | | | | | | ||||||
| * | | | | | | step: generalized new config interface for all module types | Rainer Gerhards | 2011-05-06 | 7 | -0/+11 | |
| | | | | | | | ||||||
| * | | | | | | step: imtcp moved to new config interface | Rainer Gerhards | 2011-05-05 | 15 | -137/+202 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | as far as we know that new interface right now ;) | |||||
| * | | | | | | step: imudp utilizes interim new input module interface | Rainer Gerhards | 2011-05-04 | 1 | -162/+266 | |
| | | | | | | | ||||||
| * | | | | | | step: small improvements to input mod config plumbing | Rainer Gerhards | 2011-05-03 | 1 | -3/+0 | |
| | | | | | | | ||||||
| * | | | | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 15 | -12/+466 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2011-04-27 | 1 | -2/+7 | |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c | |||||
| | * | | | | | bugfix: rate-limiting inside imuxsock did not work 100% correct | Rainer Gerhards | 2011-04-27 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason was that a global config variable was invalidly accessed where a listener variable should have been used. Also performance-improved the case when rate limiting is turned off (this is a very unintrusive change, thus done directly to the stable version). | |||||
| * | | | | | | minor: some better debug instrumentation | Rainer Gerhards | 2011-04-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-26 | 1 | -4/+20 | |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c | |||||
| | * | | | | | Merge branch 'v5-devel-systemd-pri' into v5-devel | Rainer Gerhards | 2011-04-19 | 1 | -4/+20 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | experimental: support for systemd-induced second PRI in klog | Rainer Gerhards | 2011-03-18 | 1 | -4/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if systemd writes a kernel log entry with a non-kernel priority, the priority recorded in the kernel log will be wrong. However, it will be immediately followed by another priority (with the kernel timestamp in between, if enabled). So imklog now tries to see if there is a second PRI and, if so, uses it. Note that we already support non-kernel PRIs in the kernel log, as this was done in BSD for quite some while. HOWEVER the config statement "$klogpermitnonkernelfacility on" must be used to permit this (otherwise non kernel messages are dropped). Sample of a such a message on a kernel without timestamping enabled: $ echo '<14>text' > /dev/kmsg $ dmesg -r <4><14>text NOTE: support for timestamp is NOT YET ENABLED! | |||||
| * | | | | | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 6 | -6/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 23 | -24/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". | |||||
| * | | | | | | | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 23 | -24/+24 | |
| | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |