summaryrefslogtreecommitdiffstats
path: root/runtime/rsyslog.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2012-12-181-2/+1
|\ | | | | | | | | Conflicts: runtime/rsyslog.h
| * cosmetic: re-use existing error code instead of new oneRainer Gerhards2012-12-181-2/+1
| |
* | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2012-12-181-0/+1
|\| | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h
| * omudpspoof: improve libnet calling sequenceRainer Gerhards2012-12-181-0/+1
| | | | | | | | retains bugfix while increasing performance again
* | bugfix[minor]: invalid error code when mmnormalize could not access rulebaseRainer Gerhards2012-11-301-0/+1
| |
* | bugfix: no error message for invalid string template parametersRainer Gerhards2012-11-291-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 propertiesRainer Gerhards2012-11-061-0/+1
| | | | | | | | | | Linear runtime due to message order. Was quadratic before. However, not a big overall improvement.
* | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-301-0/+1
|\ \
| * | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-151-0/+1
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-151-0/+1
| | |
| * | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-151-1/+0
| | |
| * | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-121-0/+1
| | |
* | | Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-291-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | omelasticsearch: parse JSON response (in regard to data errors)Rainer Gerhards2012-07-251-0/+1
| | | | | | | | | | | | note: bulkmode response processing is still mostly missing
* | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+1
| |/ |/|
* | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-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() statementRainer Gerhards2012-09-281-0/+1
| |
* | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | input stmt: add core engine plumbingRainer Gerhards2012-09-261-0/+1
| | |
* | | Implement RainerScript field() functionRainer Gerhards2012-09-201-0/+1
| | |
* | | new ruleengine: Implent "unset" statementRainer Gerhards2012-09-171-0/+1
| | |
* | | Implement set config stmt (initial version)Rainer Gerhards2012-09-131-0/+1
| | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;)
* | | new ruleengine: properly remove BSD-style blocksRainer Gerhards2012-09-111-0/+1
| | |
* | | Merge branch 'master' into v7-develRainer Gerhards2012-08-291-0/+1
|\| |
| * | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-291-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-develRainer Gerhards2012-08-271-0/+1
|\| | | | | | | | | | | | | | Conflicts: runtime/msg.c
| * | add uuid property to message objectJérôme Renard2012-08-261-0/+1
| | |
* | | milestone: first PoC for hierarchical data inside msgRainer Gerhards2012-08-271-0/+5
|/ /
* | Merge branch 'beta'Rainer Gerhards2012-06-291-0/+1
|\| | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+1
| |
* | provide support to dynamically enable/disable legacy conf commandRainer Gerhards2012-06-261-0/+1
| | | | | | | | most important to prevent clashes with new style settings
* | milestone: module() config statement basically worksRainer Gerhards2012-06-211-0/+3
|/ | | | some nits to iron out, only omfile actually support module params
* Merge branch 'v6-stable'Rainer Gerhards2012-04-181-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. Falco2012-04-131-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-stableRainer Gerhards2012-01-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-271-0/+1
| | |\
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+1
| | | | | | | | | | | | | | | | configured
| | | * issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+1
| | | |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-131-3/+4
| | | |
* | | | ommongodb: honor db and collection config parametersRainer Gerhards2012-03-171-0/+1
| | | |
* | | | added message property parsesuccess to indicate status of higher level ↵Rainer Gerhards2012-03-151-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 Gerhards2011-10-211-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-211-0/+1
| | | | |
| | * | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-0/+1
| | | | |
* | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-111-0/+2
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-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 warningsRainer Gerhards2011-08-091-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 usedRainer Gerhards2011-07-061-0/+1
| | | | |