Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 4 | -22/+15 |
| | | | | also some cleanup | ||||
* | milestone: LIST-type templates support full option set | Rainer Gerhards | 2012-08-25 | 2 | -5/+77 |
| | |||||
* | milestone: LIST-type template now only missing regex support | Rainer Gerhards | 2012-08-25 | 1 | -0/+41 |
| | |||||
* | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 4 | -13/+291 |
| | |||||
* | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 5 | -18/+106 |
| | |||||
* | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 23 | -109/+238 |
|\ | |||||
| * | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 23 | -110/+239 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 21 | -105/+193 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | ||||
| | | * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 3 | -30/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice | ||||
| | | * | | preparing for 5.10.0 release | Rainer Gerhards | 2012-08-22 | 4 | -4/+11 |
| | | | | | |||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 1 | -2/+6 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | | * | preparing for 5.8.13 release | Rainer Gerhards | 2012-08-22 | 3 | -3/+3 |
| | | | | | |||||
| | | | * | nit: forward-compatible default ruleset name as used in next version | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | small bugfix: stream timeout API use was incorrect | Rainer Gerhards | 2012-08-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this. | ||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 6 | -18/+119 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 3 | -3/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog. | ||||
| | | * | | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 14 | -46/+45 |
| | | | | | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | * | | | Merge branch 'beta' into v6-stable | Rainer Gerhards | 2012-08-20 | 211 | -11720/+15449 |
| | |\ \ \ | |||||
| | | * | | | nitfix: status indication (now: stable) was invalid in ChangeLog | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 3 | -3/+61 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | nitfix: remove quirck in new debug message code | Rainer Gerhards | 2012-08-01 | 1 | -4/+2 |
| | | | | | | |||||
| | | | * | | more elaborate debug logging for object deserializer | Rainer Gerhards | 2012-08-01 | 1 | -0/+39 |
| | | | | | | |||||
| | | | * | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 2 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | ||||
| | | | * | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 2 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347 | ||||
| | | | * | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 2 | -1/+5 |
| | | | | | | |||||
| | | * | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 3 | -3/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
* | | | | | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 3 | -3/+180 |
| | | | | | | |||||
* | | | | | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 4 | -2/+33 |
|/ / / / / | |||||
* | | | | | Fix printing of some template options | Miloslav Trmač | 2012-08-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | | | doc: add imported patch to ChangeLog | Rainer Gerhards | 2012-08-21 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Fix undefined ctxee problem | Milan Bartos | 2012-08-21 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
* | | | | | update documentation for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Add support for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -30/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off) | ||||
* | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-08-02 | 2 | -1/+8 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2012-08-01 | 2 | -1/+8 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | doc: add last patch to Changelog | Rainer Gerhards | 2012-08-01 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | fix problem with cutting first 16 characters from message with bAnnotate on ↵ | Milan Bartos | 2012-08-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
* | | | | | | doc: added last patch to ChangeLog | Rainer Gerhards | 2012-07-31 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Fix $SystemLogSocketAnnotate | Miloslav Trmač | 2012-07-31 | 1 | -3/+2 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | | | imzmq3: Added the return call to runInput | David Kelly | 2012-07-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Just to be sure that nothing unfortunate would happen, possible that housekeeping would not get done without this. | ||||
* | | | | | BAT-40 Found leak in imzmq3 plugin | David Kelly | 2012-07-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | For some reason I forgot to free() the buffer that comes back from zstr_recv(). Doh! | ||||
* | | | | | doc: improved doc for built-in modules | Florian Riedl | 2012-07-24 | 7 | -24/+443 |
| | | | | | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 10 | -60/+257 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | omelasticsearch: regression from "parent" feature could case aborts | Rainer Gerhards | 2012-07-11 | 1 | -23/+26 |
| | | | | | | | | | | | | | | | | | | | | this was not present in any released version | ||||
| * | | | | bugfix: imtcp aborted when more than 2 connections were used. | Andre Lorbach | 2012-07-11 | 4 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342 | ||||
| * | | | | omelasticsearch: support for parameters parent & dynparent added | Rainer Gerhards | 2012-07-10 | 2 | -20/+98 |
| | | | | |