summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-beta'Rainer Gerhards2012-04-124-15/+10
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-122-6/+9
| |
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-122-9/+1
| |\
| | * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-122-9/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-112-9/+1
| | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-2/+2
| | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion.
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-072-0/+18
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-122-2/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
* | \ \ \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-075-2/+39
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-0/+13
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
| * | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+6
| | |_|_|/ | |/| | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
| * | | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-102-1/+6
| | | | |
| * | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-1/+6
| | | | | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-241-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
* | \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-04-071-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-0/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-071-1/+1
| | | |_|_|/ / | | |/| | | |
| | * | | | | doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| | | | | | |
| | * | | | | preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-151-1/+1
| | | |_|/ / | | |/| | |
| | * | | | preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-051-1/+1
| | | |/ / | | |/| |
| | * | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-171-1/+1
| | | | |
| * | | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-091-1/+1
| | | | |
* | | | | impstats: added $PStatsJSON directiveRainer Gerhards2012-04-011-0/+4
| | | | |
* | | | | added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-291-0/+4
| | | | | | | | | | | | | | | | | | | | timestamp
* | | | | added "json" property replacer optionRainer Gerhards2012-03-161-0/+6
| | | | |
* | | | | added message property parsesuccess to indicate status of higher level ↵Rainer Gerhards2012-03-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | upgraded omlibdbi to support the new v6 config formatRainer Gerhards2012-02-021-22/+34
| | | | |
* | | | | ommysql: updated docRainer Gerhards2012-02-021-16/+30
| | | | |
* | | | | preparing for 6.3.7Rainer Gerhards2012-01-311-1/+1
| | | | |
* | | | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-183-1/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-)
| * | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-102-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+4
| | |\| | | |
| | | * | | | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | finally cleaning up the syslog-ng rsyslog comparisonRainer Gerhards2012-01-091-112/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this page should be removed from the doc set over time -- it really does not belong here.
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-01-094-43/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * | | | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-094-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-1/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-194-4/+49
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | | added instrumentationRainer Gerhards2011-12-191-1/+3
| | | |_|_|/ | | |/| | |
| * | | | | more work on queue statistics counterRainer Gerhards2011-12-161-1/+3
| | | | | |