summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
|\
| * bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-201-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 betaRainer Gerhards2011-12-161-3/+1
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-3/+1
| |\
| | * bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-3/+1
| | |
| | * Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| | |\
| | * \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-3/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-131-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-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 betaRainer Gerhards2011-09-261-5/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-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 betaRainer Gerhards2011-08-311-0/+1
|\| | | |
| * | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | | | |
* | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | thanks to darix for alerting me
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-9/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | | | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
| | | | | | | | | | | | | | | | | | | | backport from v6
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-204-5/+435
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cleanup: removed useless & undocumented config directive from imrelpRainer Gerhards2011-05-201-5/+0
| | | |/ | | |/|
| * | | omlibdbi: added necessary includeRainer Gerhards2011-05-121-0/+1
| | | |
| * | | mmsnmptrapd: removed unnecessary includesRainer Gerhards2011-05-121-3/+0
| | | |
| * | | undo accidental removal of a componentRainer Gerhards2011-05-101-0/+6
| | | |
| * | | mmsnmptrapd: added doc & mentioned in ChangeLogRainer Gerhards2011-05-101-6/+0
| | | |
| * | | cosmetic cleanupRainer Gerhards2011-05-091-2/+0
| | | |
| * | | mmsnmptrapd: added capability to specify severity mappingRainer Gerhards2011-05-091-2/+154
| | | |
| * | | mmsnmptrap: added TAG processingRainer Gerhards2011-05-061-1/+77
| | | |
| * | | added skeleton for mmsnmptrapdRainer Gerhards2011-05-052-0/+215
| | | |
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-05-091-2/+7
|\| | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c
| * | | bugfix: rate-limiting inside imuxsock did not work 100% correctRainer Gerhards2011-04-271-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 Gerhards2011-04-153-5/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-04-153-5/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-04-151-2/+12
| | |\| |
| | | * | bugfix: IPv6-address could not be specified in omrelpRainer Gerhards2011-04-141-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 todayRainer Gerhards2011-04-151-3/+11
| | | | |
| | * | | bugfix: doc for impstats had wrong config statementsRainer Gerhards2011-04-141-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 mergeRainer Gerhards2011-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | (affected UDP realtime capabilities)
* | | | | added log classification capabilities (via mmnormalize & tags)Rainer Gerhards2011-04-131-3/+3
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-121-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
| * | | | added new config directive $InputTCPFlowControl...Rainer Gerhards2011-04-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-314-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-develRainer Gerhards2011-03-314-2/+398
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | fixed problem in testbench & added new test (not yet integrated)Rainer Gerhards2011-03-301-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 PostgresChristian Kastner2011-03-291-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | did mapping of data items to database table columnsRainer Gerhards2011-03-291-14/+9
| | | | | | | | | | | | | | | | | | | | to facilitate testing
| | * | | sm_cust_bindcdr: custom date parsing addedRainer Gerhards2011-03-281-10/+90
| | | | |
| | * | | sm_bind_cdr: added capability to configure "allowed IPs"Rainer Gerhards2011-03-221-3/+80
| | | | |
| | * | | added internal processing of BIND recordsRainer Gerhards2011-03-221-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 outputsRainer Gerhards2011-03-211-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 Gerhards2011-03-171-31/+14
| | | | | | | | | | | | | | | | | | | | | | | | | bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases