| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | | | |||||
| * | | | | | - imudp&imtcp now report error if no listener at all was defined | Rainer Gerhards | 2011-08-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message | ||||
| * | | | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
| * | | | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| | * | | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-07-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c | ||||
| | * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+2 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | | | | better handling of queue i/o errors in disk queues. | Rainer Gerhards | 2011-05-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is kind of a bugfix, but a very intrusive one, thus it goes into the devel version first. Right now, "file not found" is handled and leads to the new emergency mode, in which disk action is stopped and the queue run in direct mode. An error message is emited if this happens. | ||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -0/+1 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| | * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -0/+1 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | | * | | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes | Rainer Gerhards | 2011-06-15 | 1 | -0/+1 |
| | | |/ / | |||||
| * | | | | step: imuxsock changed to new config system | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | now also properly works with privilege drop | ||||
| * | | | | step: imudp utilizes interim new input module interface | Rainer Gerhards | 2011-05-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | step: slowly migrating config settings... ;) | Rainer Gerhards | 2011-04-19 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -0/+5 |
| |/ / / | |||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| | * | | enhance: added $BOM system property to ease writing byte order masks | Rainer Gerhards | 2011-03-22 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | improved error reporting for $WorkDirectory | Rainer Gerhards | 2011-02-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | non-existance and other detectable problems are now reported, and the work directory is NOT set in this case | ||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-02-01 | 1 | -0/+7 |
| |\| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c | ||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |