summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2012-10-046-28/+2
|\
| * 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-045-28/+2
| |\ | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| | |\
| | | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
* | | | omlibdbi improvementsRainer Gerhards2012-10-043-44/+161
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | doc: add missing files to distribution tarballRainer Gerhards2012-10-042-0/+6
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-044-0/+32
|\| |
| * | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| | |
| * | cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
| | |
* | | prepare for 7.1.8 releasev7.1.8Rainer Gerhards2012-10-023-6/+6
| | |
* | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-024-8/+35
| | |
* | | 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-022-10/+11
| | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-024-0/+482
|\ \ \
| * | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| | | |
| * | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-022-1/+3
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-2/+2
| | |\|
| | | * minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
| | | |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-023-3/+5
| | |\|
| | | * cleanupRainer Gerhards2012-10-021-1/+1
| | | |
| | | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
| | | | | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | | minor: mention better doc in ChangeLogRainer Gerhards2012-10-021-0/+1
| | | |
* | | | doc: update module doc to new capabilitiesFlorian Riedl2012-10-026-64/+135
| | | |
* | | | implement "continue" RainerScript statementRainer Gerhards2012-10-014-1/+10
| | | |
* | | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-015-5/+16
| | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | | preparing for 7.1.7 releasev7.1.7Rainer Gerhards2012-10-013-3/+3
| | | |
* | | | implement RainerScript "call" statementRainer Gerhards2012-10-016-4/+70
| | | |
* | | | doc: add SQL-template exampleTim Eifler2012-10-011-0/+29
| | | |
* | | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-014-9/+26
| | | |
* | | | cleanupRainer Gerhards2012-10-011-1/+0
| | | |
* | | | refactor: unify nodetypesRainer Gerhards2012-10-012-14/+14
| | | |
* | | | fix: invalid free in array-based string comparisonsRainer Gerhards2012-10-011-3/+7
| | | |
* | | | implement string arrays for config objectsRainer Gerhards2012-10-015-51/+170
| | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-283-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | preparing for 7.1.6 releasev7.1.6Rainer Gerhards2012-09-283-3/+7
| | | | |
* | | | | cleanupRainer Gerhards2012-09-282-9/+0
| | | | |
* | | | | implement RainerScript array-based string comparison operationsRainer Gerhards2012-09-282-13/+80
| | | | |
* | | | | rainerscript: add basic plumbing for arraysRainer Gerhards2012-09-284-5/+94
|/ / / / | | | | | | | | | | | | | | | | can be used in expressions, but always evaluate to the first element, only
* | | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-2810-8/+77
| | | |
* | | | somewhat better debug outputRainer Gerhards2012-09-283-3/+9
| | | |
* | | | cleanupRainer Gerhards2012-09-281-5/+1
| | | | | | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code
* | | | fix screwed-up ChangeLogRainer Gerhards2012-09-281-12/+8
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-288-153/+578
|\| | |