summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
| | | | merge for action list functionality will follow soon
* Merge branch 'beta'Rainer Gerhards2012-10-221-0/+4
|\
| * disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
* | Merge branch 'beta'Rainer Gerhards2012-10-191-2/+2
|\|
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-191-5/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
| |\| |
| | * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | |
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-181-5/+5
|\ \ \ \
| * | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-101-5/+5
| | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each.
* | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-173-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on.
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-172-3/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | |
| | | * | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | |
| | | * | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-161-8/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
| |\| | |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | | * | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| | | * | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-10-101-1/+5
| | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| | * | | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-1/+1
|\| | | |
| * | | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one.
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+6
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+6
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-042-6/+0
|\| | |
| * | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| | | | | | | | | | | | | | | | This is no longer needed.
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-6/+0
| |\| | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-6/+0
| | |\|
| | | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
* | | | omlibdbi improvementsRainer Gerhards2012-10-041-26/+125
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work.
* | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
| | |
* | | cleanupRainer Gerhards2012-10-021-3/+0
| | |
* | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-10/+10
| | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object.
* | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
| | | | | | | | | | | | modified: mmjsonparse.c
* | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-4/+20
| | |
* | | implement string arrays for config objectsRainer Gerhards2012-10-011-18/+35
| | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | somewhat better debug outputRainer Gerhards2012-09-282-2/+6
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-283-46/+205
|\ \ \
| * | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| | | |
| * | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| | | |
| * | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-207/+908
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-7/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 11:33:27 +0000