Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -2/+5 |
|\ | |||||
| * | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | ||||
* | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 1 | -3/+1 |
|\| | |||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 1 | -3/+1 |
| |\ | |||||
| | * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 1 | -3/+1 |
| | | | |||||
| | * | 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 | ||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas. | ||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -5/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281 | ||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | doc: cleanup of copy-and-paste error in comment | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | thanks to darix for alerting me | ||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -9/+14 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | | reduced sporadic failures during make check | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | backport from v6 | ||||
* | | | | | 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 | ||||
| * | | | 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). | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-04-15 | 1 | -2/+12 |
| | |\| | | |||||
| | | * | | bugfix: IPv6-address could not be specified in omrelp | Rainer Gerhards | 2011-04-14 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 | ||||
| | * | | | sm_cust_bindcdr: updated field mapping according to spec received today | Rainer Gerhards | 2011-04-15 | 1 | -3/+11 |
| | | | | | |||||
| | * | | | bugfix: doc for impstats had wrong config statements | Rainer Gerhards | 2011-04-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem. | ||||
* | | | | | bugfix: enhanced imudp config processing code disabled due to wrong merge | Rainer Gerhards | 2011-04-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | (affected UDP realtime capabilities) | ||||
* | | | | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-12 | 1 | -1/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c | ||||
| * | | | | added new config directive $InputTCPFlowControl... | Rainer Gerhards | 2011-04-01 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not. | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 4 | -2/+398 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2011-03-31 | 4 | -2/+398 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | fixed problem in testbench & added new test (not yet integrated) | Rainer Gerhards | 2011-03-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241 | ||||
| | * | | | Force ANSI SQL treatment of strings for Postgres | Christian Kastner | 2011-03-29 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | did mapping of data items to database table columns | Rainer Gerhards | 2011-03-29 | 1 | -14/+9 |
| | | | | | | | | | | | | | | | | | | | | to facilitate testing | ||||
| | * | | | sm_cust_bindcdr: custom date parsing added | Rainer Gerhards | 2011-03-28 | 1 | -10/+90 |
| | | | | | |||||
| | * | | | sm_bind_cdr: added capability to configure "allowed IPs" | Rainer Gerhards | 2011-03-22 | 1 | -3/+80 |
| | | | | | |||||
| | * | | | added internal processing of BIND records | Rainer Gerhards | 2011-03-22 | 1 | -6/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | still some questions outstanding, so actual SQL statement is not usable at the moment | ||||
| | * | | | bugfix: strgen could not be used together with database outputs | Rainer Gerhards | 2011-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195 | ||||
| | * | | | setup test environment and test code in order to look at... | Rainer Gerhards | 2011-03-17 | 1 | -31/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases |