Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| |\ | |||||
| | * | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-10-18 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each. | ||||
* | | | | imklog: add paramter "keepkerneltimestamp" | Rainer Gerhards | 2012-10-17 | 3 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\| | | | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | | * | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -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 Bartos | 2012-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
| | * | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -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 Gerhards | 2012-10-11 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -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 Gerhards | 2012-10-11 | 1 | -0/+6 |
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-04 | 2 | -6/+0 |
|\| | | | |||||
| * | | | re-delete cust1.c plugin dummy file | Rainer Gerhards | 2012-10-04 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | This is no longer needed. | ||||
| * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | |\| | |||||
| | | * | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -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 improvements | Rainer Gerhards | 2012-10-04 | 1 | -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 warning | Rainer Gerhards | 2012-10-02 | 1 | -4/+0 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -3/+0 |
| | | | |||||
* | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -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 ceelog | Milan Bartos | 2012-10-02 | 1 | -0/+9 |
| | | | | | | | | | | | | modified: mmjsonparse.c | ||||
* | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 1 | -4/+20 |
| | | | |||||
* | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -18/+35 |
| | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 2 | -2/+6 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 3 | -46/+205 |
|\ \ \ | |||||
| * | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | | |||||
| * | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | | |||||
| * | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 6 | -207/+908 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -9/+77 |
| | | | | |||||
| * | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | | |||||
| * | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | | |||||
| * | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | | |||||
| * | | | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -9/+84 |
| | | | |