| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
| |\ | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | imklog: added $klogParseKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time. | ||||
| | * | imklog: added $klogKeepKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -0/+5 |
| | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too. | ||||
| * | | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | | |||||
| * | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 20 | -152/+1289 |
| |\ \ | |||||
| | * | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | |\ \ | |||||
| | * | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | |||||
| | * | | | doc: add new functions to RainerScript function list | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -0/+9 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| | * | | | | switch field default to "mandatory" and implement that mode | Rainer Gerhards | 2012-08-30 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | Add support for optional fields | Miloslav Trmač | 2012-08-29 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | also some type cleanup and simplification | ||||
| | * | | | | add OMSR_TPL_AS_JSON mode for output modules (interface only) | Rainer Gerhards | 2012-08-29 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on. | ||||
| | * | | | | preparing for 6.5.0 releasev6.5.0 | Rainer Gerhards | 2012-08-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | doc: new template system, some more output modules | Rainer Gerhards | 2012-08-28 | 4 | -21/+434 |
| | | | | | | | | | | | | | | | | | | | | | added base doc for new config language | ||||
| | * | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| | * | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| | * | | | | | update documentation for parsing trusted properties | Milan Bartos | 2012-08-21 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | doc: improved doc for built-in modules | Florian Riedl | 2012-07-24 | 7 | -24/+443 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * \ \ \ \ \ | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | | | | | | | doc: typo fix | Rainer Gerhards | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -0/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-04 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | | | | | | | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 1 | -0/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
| | * | | | | | | | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 2 | -10/+19 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
| * | | | | | | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | bugfix: missing support for escape sequences in RainerScript | Rainer Gerhards | 2012-09-13 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. | ||||
| * | | | | | | | | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | INCOMPATIBLE: use :, not =, as separator for jsonf | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | | | | | | preparing for 6.4.0 release | Rainer Gerhards | 2012-08-20 | 1 | -1/+1 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | preparing for 6.3.12v6.3.12 | Rainer Gerhards | 2012-07-02 | 1 | -1/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 1 | -1/+1 |
| | |_|_|/ |/| | | | |||||
| * | | | | preparing for 6.3.10 | Rainer Gerhards | 2012-06-04 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | preparing for 6.3.9 (beta) releasev6.3.9 | Rainer Gerhards | 2012-05-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -10/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| | * \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -10/+10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | | preparing for 5.8.11 releasev5.8.11 | Rainer Gerhards | 2012-05-03 | 1 | -1/+1 |
| | | | |/ | | |/| | |||||
| | | * | | doc: correcting sample section of omudpspoof | Rainer Gerhards | 2012-04-20 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | again, credits to Jo Rhett for reporting this issue | ||||
| | | * | | doc: omudpspoof doc had invalid directives | Rainer Gerhards | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for reporting the bug. | ||||
| * | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -0/+9 |
| | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |