Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | | * | Free also LocalDomain in glbl class destructor | Marius Tomaschewski | 2012-04-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| | | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -44/+63 |
| | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 1 | -31/+38 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c | ||||
| * | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -31/+38 |
| | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 4 | -53/+123 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 7 | -5/+74 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| * \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 3 | -16/+19 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
* | \ \ \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 8 | -52/+177 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+8 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -47/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h | ||||
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 3 | -2/+11 |
| |\ \ \ \ \ | |||||
| * | | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 2 | -3/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| * | | | | | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
| * | | | | | | stats: added unique (and friendly) name for ruleset queues | Rainer Gerhards | 2012-01-31 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-30 | 3 | -16/+19 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-07 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-07 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵ | Tomas Heinrich | 2012-04-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | | | | bugfix: segfault if disk-queue was started up with old queue file | Tomas Heinrich | 2012-04-05 | 1 | -3/+6 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | | | impstats: added $PStatsJSON directive | Rainer Gerhards | 2012-04-01 | 2 | -4/+21 |
| | | | | | | | |||||
* | | | | | | | stats module: added capability to format as cee-enhanced syslog | Brian Knox | 2012-04-01 | 1 | -0/+50 |
| | | | | | | | |||||
* | | | | | | | ommongodb: now writes a real timestamp into mongo | Rainer Gerhards | 2012-03-30 | 2 | -10/+21 |
| | | | | | | | |||||
* | | | | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵ | Rainer Gerhards | 2012-03-29 | 5 | -2/+133 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp | ||||
* | | | | | | | action cfg: do no longer require template for TPL_AS_MSG passing mode | Rainer Gerhards | 2012-03-19 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | ommongodb: honor db and collection config parameters | Rainer Gerhards | 2012-03-17 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-17 | 4 | -38/+60 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h | ||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| |\| | | | | | |||||
| | * | | | | | changed statsobj interface and added better doc | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | added "json" property replacer option | Rainer Gerhards | 2012-03-16 | 1 | -2/+110 |
| | | | | | | |||||
* | | | | | | added message property parsesuccess to indicate status of higher level ↵ | Rainer Gerhards | 2012-03-15 | 3 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parser run added message property parsesuccess to indicate if the last run higher-level parser could successfully parse the message or not (see property replacer html doc for details) | ||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-12 | 3 | -1/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-12 | 3 | -2/+11 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | bugfix: stopped DA queue was never processed after a restart | Rainer Gerhards | 2012-03-12 | 3 | -2/+11 |
| | | |/ / | | |/| | | | | | | | | | | | | ...due to a regression from statistics module. | ||||
* | | | | | changes needed for libee 0.4.2 | Rainer Gerhards | 2012-02-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | bugfix: property $!all-json made rsyslog abort if no normalized data is ↵ | Rainer Gerhards | 2012-02-21 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | available | ||||
* | | | | | dns cache: working on invalid resolution bug, again | Rainer Gerhards | 2012-02-09 | 3 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | the proposed solution did not work out well... | ||||
* | | | | | dns cache: experimental fix for name resulution problem | Rainer Gerhards | 2012-02-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | dns chache: added some more error instrumentation | Rainer Gerhards | 2012-02-06 | 2 | -31/+28 |
| | | | | | |||||
* | | | | | cleanup: remove code for no-longer needed legacy conf functionality | Rainer Gerhards | 2012-02-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | conf file: bufgix: legacy parsing of some filters did not work correctly | Rainer Gerhards | 2012-02-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | bugfix: rsyslog aborted during startup if there is an error in loading an action | Rainer Gerhards | 2012-01-27 | 3 | -24/+18 |
| | | | | | | | | | | | | | | | | | | | | and legacy configuration mode is used | ||||
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-27 | 2 | -16/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 3 | -17/+19 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h |