summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | initial work on omprog, an output module to send messages to another programRainer Gerhards2009-04-013-19/+93
| | | | | | | |
| * | | | | | | fixed compile-time problems in im3195Rainer Gerhards2009-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... however, I did not not a test run due to the lack of existing test drivers and the very low (aka "non-existing" interest from the userbase in the feature).
* | | | | | | | added a new error code for too-old rsyslog coreRainer Gerhards2009-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which can be emittend when plugin can not load due to missing core functionality.
* | | | | | | | Fixing the batch insertions.Luis Fernando Muñoz Mejías2009-04-161-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous versions inserted garbage (the pointer was interpreted as the string itself). It seems inserting arrays of strings is not that easy with OCI. This approach consumes 2KB per entry in the batch, so if you have batches of size 1000 you'll be using 2MB for the batch. This size doesn't change, anyways and the risk of leaking memory is gone. OCI doesn't deal well with batches of strings. :(
* | | | | | | | Add the callback for OCIBindDynamic.Luis Fernando Muñoz Mejías2009-04-161-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's hope it works.
* | | | | | | | Add some debugging outputLuis Fernando Muñoz Mejías2009-04-161-0/+1
| | | | | | | |
* | | | | | | | Make the counting of bind parameters aware of literals.Luis Fernando Muñoz Mejías2009-04-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Literal strings passed in the statement may contain ':', let's not count them.
* | | | | | | | Fixed a mem leakLuis Fernando Muñoz Mejías2009-04-161-0/+1
| | | | | | | |
* | | | | | | | Convert to the array-based interface.Luis Fernando Muñoz Mejías2009-04-162-41/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll receive a single statement to be prepared and a batch size. Then, doAction will execute the statement only once per batch hit, making the process much more efficient. This will reduce network and DB server overhead. The downside is that this version cannot be used with rsyslog v3 anymore. If anyone is interested on backporting the module, they should choose all patches up to this one. Better documentation may follow.
* | | | | | | | Merge branch 'nextmaster' into oracleRainer Gerhards2009-04-091-0/+1
|\| | | | | | |
| * | | | | | | Merge branch 'master' into nextmasterRainer Gerhards2009-04-091-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | Merge branch 'beta'Rainer Gerhards2009-04-091-0/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c tcpsrv.h Note: we have a slight inconsistency, as interface version v4 was already used for tcpsrv in this branch. We accept this inconsistency.
| | | * | | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-04-091-0/+1
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | * | | | bugfix: $InputTCPMaxSessions config directive was accepted, but not honoredRainer Gerhards2009-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in a fixed upper limit of 200 connections.
* | | | | | | | Stop omoracle losing messages on rsyslog shutdown.Luis Fernando Muñoz Mejías2009-04-091-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rsyslog shuts down, we must send and commit any pending messages or information will be lost. It will make rsyslog's shut down slower, but also more reliable.
* | | | | | | | Solve a memory leak when freeing Oracle instances.Luis Fernando Muñoz Mejías2009-04-091-1/+0
| | | | | | | |
* | | | | | | | Make it work in batches of statements.Luis Fernando Muñoz Mejías2009-04-091-11/+60
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, all statements to be executed are stored on the same structure. When the batch size is reached, all statements are executed in a single transaction, and then committed. There are many corner cases in which an error may happen and the batch may be left in an inconsistent state, perhaps leaking memory or crashing. They will be fixed.
* | | | | | | Merge branch 'oracle' into nextmasterRainer Gerhards2009-04-084-0/+378
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'nextmaster' into oracleRainer Gerhards2009-04-071-0/+2
| |\| | | | | |
| * | | | | | | Merge branch 'master' into oracleRainer Gerhards2009-04-032-3/+79
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into oracleRainer Gerhards2009-04-024-0/+271
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am
| * | | | | | | | some small changes (as suggestion)Rainer Gerhards2009-04-011-8/+6
| | | | | | | | |
| * | | | | | | | Convert the module configuration to $Action... directives.Luis Fernando Muñoz Mejías2009-04-011-23/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the old-style configuration parameters, use $... directives, which lead to simpler code, and also should make user's configurations simpler. Needs some testing. Currently, the supported directives are $OmoracleDB, $OmoracleDBUser and $OmoracleDBPassword. $OmoracleDBStatement and $OmoracleDBBatchSize may follow.
| * | | | | | | | Add a SELinux policy that allows the module to load on RHEL5.Luis Fernando Muñoz Mejías2009-04-011-0/+13
| | | | | | | | |
| * | | | | | | | Make tryResume not to retry the last action, but just to reconnect.Luis Fernando Muñoz Mejías2009-04-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core will call the action if tryResume succeeds, no need to make it from here.
| * | | | | | | | added some (hopefully helpful) comments on the calling IFRainer Gerhards2009-03-251-0/+27
| | | | | | | | |
| * | | | | | | | Remove useless dbgprintf and add documentation.Luis Fernando Muñoz Mejías2009-03-251-2/+10
| | | | | | | | |
| * | | | | | | | Add proper indentation (despite Emacs) and support for retrying.Luis Fernando Muñoz Mejías2009-03-251-78/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs doesn't allow for proper indentation with rsyslog's macros (no curly brackets, so it doesn't know where functions start), so I had to manually add such indentation. Add support for retrying actions, namely, disconnect from the DB, re-connecting and re-executing the last prepared statement. Needs to be tested.
| * | | | | | | | Add the ability to actually run statements.Luis Fernando Muñoz Mejías2009-03-251-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now runs SQL statements given as templates. In this case, the template is given on the configuration file and the core passes the SQL statement correctly formatted to doAction. I still need to decide how to structure this for having prepared statements (prepare them at parseSelector time) and then make doAction to only bind arguments and execute. It commits after each statement, which is awfully slow but good enough for the moment. Next step after that is have a buffer of arguments, and make doAction store new data as it arrives, then run the statement only when the buffer is almost full. Or something like that.
| * | | | | | | | Add the ability to connect to the DB based on the config line.Luis Fernando Muñoz Mejías2009-03-251-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will read and parse the config line (this code is not yet rock-solid) and connect to the database at initialization time. I also cleaned some debug messages that are not needed anymore.
| * | | | | | | | Add handlers on modInit.Luis Fernando Muñoz Mejías2009-03-251-9/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids crashes on initialization.
| * | | | | | | | Add all other blocks (macros) needed to make this module work.Luis Fernando Muñoz Mejías2009-03-251-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this stage they are all empty, but at least it should be possible to instantiate the module and perform some basic tests. Fix some compilation warnings
| * | | | | | | | Include omoracle in the build system.Luis Fernando Muñoz Mejías2009-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configure option to build the oracle support, named --enable-oracle and fix the Makefile.am accordingly.
| * | | | | | | | Start the output module for Oracle.Luis Fernando Muñoz Mejías2009-03-253-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, resources are allocated, freed and the code compiles. No tests yet.
* | | | | | | | | fixed some portability issuesRainer Gerhards2009-03-161-1/+1
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first noticed on FreeBSD Also, some cosmetic improvements.
* | | | | | | | improved test suite and added test for new output module interfaceRainer Gerhards2009-04-031-0/+2
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testbench has now a generic driver that can run a whole class of test suites just by providing a config file and test cases. This does not cover all testing needs, but a lot. We have now added one test for the new array-passing output plugin interface.
* | | | | | | added a new way how output plugins may be passed parameters.Rainer Gerhards2009-04-031-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more efficient for some outputs. They new can receive fields not only as a single string but rather in an array where each string is seperated.
* | | | | | | added O_CLOEXEC to open() callsRainer Gerhards2009-04-021-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make sure only the minimum number of file handles is left open during a exec call. This is not a 100% solution, as there are also some fopen() calls and, more importantly, file descriptors opened by libraries. But it is better than nothing (and it was quick, at least until we run into platform hell, what we will for sure ;)).
* | | | | | begining touches for putting rsyslog on spaceshipsRainer Gerhards2009-04-012-0/+138
| | | | | |
* | | | | | improved testing supportRainer Gerhards2009-03-192-0/+133
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worked on ways to provide a better test suite: - added -T rsyslogd command line option, enables to specify a directory where to chroot() into on startup. This is NOT a security feature but introduced to support testing. Thus, -T does not make sure chroot() is used in a secure way. (may be removed later) - added omstdout module for testing purposes. Spits out all messages to stdout - no config option, no other features - modified $ModLoad statement so that for modules whom's name starts with a dot, no path is prepended (this enables relative-pathes and should not break any valid current config)
* | | | | fixed broken make distcheck due to invalidly stated omtemplate fileRainer Gerhards2009-03-191-1/+1
| | | | |
* | | | | added output module templateRainer Gerhards2009-03-162-0/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, this is mostly some documentation, but I hope that during the process of creating output modules out of it we will get good questions and thus can extend the template. In any case, it should be better than what we had so far...
* | | | | Merge branch 'beta'Rainer Gerhards2009-03-111-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/omrelp.html
| * | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-03-111-1/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | fixed a potential segfault problem in gssapi codevarmojfekoj2009-03-021-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | bugfix: parser did not correctly parse fields in UDP-received messagesRainer Gerhards2009-03-101-1/+1
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2009-02-2420-27/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html
| * | | | Improve mysql configure check (for unusual paths)Michael Biebl2009-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove AC_CHECK_HEADERS([mysql/mysql.h],...) as this was causing pain for users where the mysql headers are not installed in the system include directory. It was superfluous anyways, as we check for mysql_config and set the include path to the correct directory. Update ommysql.c to use #include <mysql.h>, as mysql_config will set the include path to /path/to/include/mysql/ so <mysql/mysql.h> would not work. Remove errmsg.h include as it is not used.
| * | | | make all cflags and libs variables uppercaseMichael Biebl2009-02-2419-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency.
* | | | | enhanced imtcp, among others to handel invalid NetScreen framingRainer Gerhards2008-12-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $InputTCPServerAddtlFrameDelimiter config directive, which enabeles to specify an additional, non-standard message delimiter for processing plain tcp syslog. This is primarily a fix for the invalid framing used in Juniper's NetScreen products. Credit to forum user Arv for suggesting this solution. - added $InputTCPServerInputName property, which enables a name to be specified that will be available during message processing in the inputname property. This is considered useful for logic that treats messages differently depending on which input received them.