| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 27 | -87/+283 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 2 | -2/+2 |
| | |\ | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 8 | -10/+238 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | | cosmetic: pushing temp version up | Rainer Gerhards | 2012-03-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 3 | -50/+3 |
| | | | | | | | | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use). | ||||
| | * | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 6 | -65/+130 |
| | | | | | | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step... | ||||
| | * | | | do not provide weblink with meaningless (generic) error code | Rainer Gerhards | 2012-03-21 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 3 | -3/+21 |
| | | | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
| | * | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 9 | -10/+29 |
| | | | | | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming | ||||
| | * | | | added missing initialization of stats counters | Rainer Gerhards | 2012-03-14 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch! | ||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 6 | -38/+66 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h | ||||
| | * | | | | bumped version number (of temp branch) | Rainer Gerhards | 2012-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 4 | -2/+15 |
| | |\ \ \ \ | |||||
| | * | | | | | added capability to use a local interface IP address as fromhost-ip for imklog | Rainer Gerhards | 2012-03-10 | 4 | -4/+34 |
| | | | | | | | |||||
| | * | | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;) | Rainer Gerhards | 2012-03-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | bugfix: imudp: only two listeners were activated | Rainer Gerhards | 2012-03-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | no matter how many were defined. Note that IPv4 and IPv6 count as two! | ||||
| | * | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 6 | -9/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| | * | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-05 | 7 | -21/+34 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | | | | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 2 | -6/+10 |
| | | | | | | | | |||||
| | * | | | | | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 6 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
| | * | | | | | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6 | Rainer Gerhards | 2012-02-20 | 2 | -2/+4 |
| | | | | | | | | |||||
| | * | | | | | | stats: added unique (and friendly) name for ruleset queues | Rainer Gerhards | 2012-01-31 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | stats: generate friendly name for action queues, if possible | Rainer Gerhards | 2012-01-31 | 2 | -3/+8 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-30 | 7 | -47/+63 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-07 | 3 | -5/+19 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-07 | 3 | -5/+19 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | | | | | | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 3 | -3/+3 |
| | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵ | Tomas Heinrich | 2012-04-05 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | | | | | | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | bugfix: segfault if disk-queue was started up with old queue file | Tomas Heinrich | 2012-04-05 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | | | | | doc: fix typo in ChangeLog | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | impstats: added $PStatsJSON directive | Rainer Gerhards | 2012-04-01 | 5 | -5/+32 |
| | | | | | | | | | |||||
| * | | | | | | | | stats module: added capability to format as cee-enhanced syslog | Brian Knox | 2012-04-01 | 1 | -0/+50 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: extended default schema | Rainer Gerhards | 2012-03-30 | 1 | -6/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes more syslog-specific fields | ||||
| * | | | | | | | | ommongodb: now writes a real timestamp into mongo | Rainer Gerhards | 2012-03-30 | 3 | -13/+47 |
| | | | | | | | | | |||||
| * | | | | | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵ | Rainer Gerhards | 2012-03-29 | 9 | -3/+145 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp | ||||
| * | | | | | | | | omhiredis: improved error reporting | Brian Knox | 2012-03-23 | 1 | -4/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | omhiredis: error checking changes and code cleanup | Brian Knox | 2012-03-21 | 1 | -40/+36 |
| | | | | | | | | | |||||
| * | | | | | | | | omhiredis: some more cleanup | Rainer Gerhards | 2012-03-21 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - C++ comments to C comment style (some compilers need that) - removed some left-over from the copy template (was even not needed there ;)) | ||||
| * | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-03-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | omhiredis: some cleanup | Rainer Gerhards | 2012-03-21 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | omhiredis: some cleanup | Rainer Gerhards | 2012-03-21 | 1 | -4/+4 |
| |/ / / / / / / / | |||||
| * | | | | | | | | initial shot at omhiredis | Brian Knox | 2012-03-21 | 8 | -0/+1151 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: working on error reporting | Rainer Gerhards | 2012-03-20 | 1 | -5/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: basic error reporting | Rainer Gerhards | 2012-03-20 | 2 | -6/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: support for lumberjack base schema | Rainer Gerhards | 2012-03-19 | 1 | -16/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as far as I currently see the mapping ;) | ||||
| * | | | | | | | | ommongodb: moved over to MSG based interface | Rainer Gerhards | 2012-03-19 | 1 | -20/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Access to the message permits us to do "the right thing" when it comes to populating the lumberjack schema. Support for custom templates will be added as soon as the template system is ready to properly support name/value passing. | ||||
| * | | | | | | | | action cfg: do no longer require template for TPL_AS_MSG passing mode | Rainer Gerhards | 2012-03-19 | 2 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: cleanup | Rainer Gerhards | 2012-03-18 | 1 | -47/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | ommongodb: moved field set a bit towards CEE | Brian Knox | 2012-03-18 | 2 | -8/+8 |
| | | | | | | | | | |||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |