Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2012-12-18 | 1 | -2/+1 |
|\ | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | cosmetic: re-use existing error code instead of new one | Rainer Gerhards | 2012-12-18 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2012-12-18 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h | ||||
| * | omudpspoof: improve libnet calling sequence | Rainer Gerhards | 2012-12-18 | 1 | -0/+1 |
| | | | | | | | | retains bugfix while increasing performance again | ||||
* | | bugfix[minor]: invalid error code when mmnormalize could not access rulebase | Rainer Gerhards | 2012-11-30 | 1 | -0/+1 |
| | | |||||
* | | bugfix: no error message for invalid string template parameters | Rainer Gerhards | 2012-11-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | rather a malformed template was generated, and error information emitted at runtime. However, this could be quite confusing. Note that with this "bugfix" user experience changes: formerly, rsyslog and the affected actions properly started up, but the actions did not produce proper data. Now, there are startup error messages and the actions are NOT executed (due to missing template due to template error). | ||||
* | | queue: reduce CPU load for deserializing message properties | Rainer Gerhards | 2012-11-06 | 1 | -0/+1 |
| | | | | | | | | | | Linear runtime due to message order. Was quadratic before. However, not a big overall improvement. | ||||
* | | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 1 | -0/+1 |
|\ \ | |||||
| * | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 1 | -0/+1 |
| | | | |||||
| * | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 1 | -1/+0 |
| | | | |||||
| * | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'beta-jsonrt' into master-es | Rainer Gerhards | 2012-10-29 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | note: bulkmode response processing is still mostly missing | ||||
* | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| |/ |/| | |||||
* | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 1 | -0/+1 |
| | | | |||||
* | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | |||||
* | | | new ruleengine: Implent "unset" statement | Rainer Gerhards | 2012-09-17 | 1 | -0/+1 |
| | | | |||||
* | | | Implement set config stmt (initial version) | Rainer Gerhards | 2012-09-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;) | ||||
* | | | new ruleengine: properly remove BSD-style blocks | Rainer Gerhards | 2012-09-11 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-29 | 1 | -0/+1 |
|\| | | |||||
| * | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development | ||||
* | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-27 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -0/+1 |
| | | | |||||
* | | | milestone: first PoC for hierarchical data inside msg | Rainer Gerhards | 2012-08-27 | 1 | -0/+5 |
|/ / | |||||
* | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -0/+1 |
|\| | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 1 | -0/+1 |
| | | |||||
* | | provide support to dynamically enable/disable legacy conf command | Rainer Gerhards | 2012-06-26 | 1 | -0/+1 |
| | | | | | | | | most important to prevent clashes with new style settings | ||||
* | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 1 | -0/+3 |
|/ | | | | some nits to iron out, only omfile actually support module params | ||||
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h | ||||
| * | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵ | Steven A. Falco | 2012-04-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started. | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 1 | -0/+1 |
| | |\ | |||||
| | | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | configured | ||||
| | | * | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | | | | bugfix: report error if module tries to request more strings than supported | Rainer Gerhards | 2012-04-13 | 1 | -3/+4 |
| | | | | |||||
* | | | | ommongodb: honor db and collection config parameters | Rainer Gerhards | 2012-03-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | added message property parsesuccess to indicate status of higher level ↵ | Rainer Gerhards | 2012-03-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parser run added message property parsesuccess to indicate if the last run higher-level parser could successfully parse the message or not (see property replacer html doc for details) | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -1/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | added support for v6 config system to omfwd | Rainer Gerhards | 2011-10-11 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c | ||||
| * | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location. | ||||
| * | | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 1 | -0/+1 |
| | | | | |