| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 2 | -1/+13 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | | doc: add incompatible patch info to ChangeLog | Rainer Gerhards | 2012-08-26 | 1 | -0/+12 | |
| | | | | | | | ||||||
| | | * | | | | INCOMPATIBLE: Return {} for missing $!all-json | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %$!all-json% will return a {}-wrapped object if there are are any events, or when there is an attached (empty) pMsg->event, but an empty string if nothing is attached. Let it return an empty object "{}" in that case for consistency. In particular, this allows $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" to always result in a valid JSON. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| | | * | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| | | * | | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| | | * | | | | Fix printing of some template options | Miloslav Trmač | 2012-08-26 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| | | * | | | | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 | |
| | | | | | | | ||||||
| | * | | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| * | | | | | | milestone: libee event removed from rsyslog core. Now pure JSON. | Rainer Gerhards | 2012-08-27 | 2 | -62/+13 | |
| | | | | | | | ||||||
| * | | | | | | imuxsock: changed to use new JSON based system | Rainer Gerhards | 2012-08-27 | 1 | -48/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Warning: only minimal testing done so far | |||||
| * | | | | | | minor cleanup | Rainer Gerhards | 2012-08-27 | 1 | -14/+0 | |
| | | | | | | | ||||||
| * | | | | | | mmnormalize: switched to new JSON system | Rainer Gerhards | 2012-08-27 | 1 | -12/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Warning: so far untested | |||||
| * | | | | | | mmauditparse: change to support new json-based system | Rainer Gerhards | 2012-08-27 | 1 | -53/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Warning: received only extremely minimal testing | |||||
| * | | | | | | milestone: first PoC for hierarchical data inside msg | Rainer Gerhards | 2012-08-27 | 5 | -35/+232 | |
| | |_|_|_|/ |/| | | | | ||||||
| * | | | | | add json-c to build system | Rainer Gerhards | 2012-08-26 | 1 | -2/+5 | |
| |/ / / / | ||||||
| * | | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| * | | | | Silence compiler warnings about unused parameters. | Miloslav Trmač | 2012-08-26 | 1 | -0/+3 | |
| | |_|/ |/| | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
| * | | | 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 releasev5.10.0 | 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 releasev5.8.13 | 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 ChangeLogv6.4.0 | 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-stablev6.2.2.with.unreleased.fixes | Rainer Gerhards | 2012-07-24 | 3 | -9/+10 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | | 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> | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |