summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* minor: some better debug instrumentationRainer Gerhards2011-04-271-1/+1
|
* Merge branch 'v5-devel'Rainer Gerhards2011-04-261-4/+20
|\ | | | | | | | | Conflicts: tools/omfile.c
| * Merge branch 'v5-devel-systemd-pri' into v5-develRainer Gerhards2011-04-191-4/+20
| |\
| | * experimental: support for systemd-induced second PRI in klogRainer Gerhards2011-03-181-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_tRainer Gerhards2011-04-196-6/+6
| | |
* | | milestone: templates are now in config objectRainer Gerhards2011-04-191-0/+1
| | |
* | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-1923-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 systemRainer Gerhards2011-04-1923-24/+24
| | |
* | | 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
| | * | prepared skeleton for new strgen moduleRainer Gerhards2011-03-172-0/+144
| | | |
| | * | backporting patch for clean make distcheckRainer Gerhards2011-03-162-0/+11
| | | |
* | | | fixed double-free regerssion, probably caused by last mergeRainer Gerhards2011-03-141-5/+0
| | | |
* | | | fixed compile problem in imtemplateRainer Gerhards2011-03-141-1/+1
| | | | | | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=235
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-145-10/+41
|\| | | | | | | | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-142-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench.
| * | | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-144-11/+25
| |\| |
| | * | fixed compile problem from epoll_create patchRainer Gerhards2011-03-141-1/+1
| | | |
| | * | Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-142-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996
| * | | omhdfs: added some info on Java environment settingsRainer Gerhards2011-03-111-0/+14
| | | |
* | | | bugfix: very minor memory leak in imfileRainer Gerhards2011-03-111-0/+5
| | | | | | | | | | | | | | | | | | | | almost cosmetic: leaks a few bytes once during a run -- more a problem for valgrind testing -- not for practical use
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-111-12/+73
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omhdfs/omhdfs.c
| * | | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | enhanced omhdfs to support batching mode. This permits to increase performance,Rainer Gerhards2011-03-091-12/+73
| | | | | | | | | | | | | | | | | | | | | | | | | as we now call the HDFS API with much larger message sizes and far more infrequently
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-1138-9/+54
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | | bugfix: minor memory leak in omlibdbi (< 1k per instance and run)Rainer Gerhards2011-03-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | also testbench improvement (omlibdbi now also receives a couple of tests if we have a life MySQL server).
| * | | | bugfix: pmaixforwarded from fails to buildMichael Biebl2011-03-101-0/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-091-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'v4-stable' into tmpRainer Gerhards2011-03-091-1/+1
| | |\|
| | | * bugfix: omlibdbi did not use password from rsyslog.conRainer Gerhards2011-03-091-1/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
| * | | bugfix: (regression) omhdfs did no longer compileRainer Gerhards2011-03-091-0/+1
| | | |
| * | | forgot to backport imdiag mem leak fix -- now doneRainer Gerhards2011-03-061-0/+4
| | | |