summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-075-35/+54
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-073-33/+42
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-0714-123/+370
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-203-2/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-1216-18/+176
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-022-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-018-63/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-0727-87/+283
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-078-10/+238
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: pushing temp version upRainer Gerhards2012-03-221-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-223-50/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-216-65/+130
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not provide weblink with meaningless (generic) error codeRainer Gerhards2012-03-211-2/+2
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-203-3/+21
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added missing initialization of stats countersRainer Gerhards2012-03-143-0/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-146-38/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bumped version number (of temp branch)Rainer Gerhards2012-03-121-1/+1
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-124-2/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-104-4/+34
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imudp: only two listeners were activatedRainer Gerhards2012-03-091-1/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-066-9/+97
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-057-21/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-222-6/+10
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-216-3/+16
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6Rainer Gerhards2012-02-202-2/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats: added unique (and friendly) name for ruleset queuesRainer Gerhards2012-01-311-1/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats: generate friendly name for action queues, if possibleRainer Gerhards2012-01-312-3/+8
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-307-47/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-04-073-5/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: fix typo in ChangeLogRainer Gerhards2012-04-071-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | impstats: added $PStatsJSON directiveRainer Gerhards2012-04-015-5/+32
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats module: added capability to format as cee-enhanced syslogBrian Knox2012-04-011-0/+50
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ommongodb: extended default schemaRainer Gerhards2012-03-301-6/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ommongodb: now writes a real timestamp into mongoRainer Gerhards2012-03-303-13/+47
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added "date-unixtimestamp" property replacer option to format as a unix times...Rainer Gerhards2012-03-299-3/+145
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omhiredis: improved error reportingBrian Knox2012-03-231-4/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omhiredis: error checking changes and code cleanupBrian Knox2012-03-211-40/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omhiredis: some more cleanupRainer Gerhards2012-03-211-8/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-03-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omhiredis: some cleanupRainer Gerhards2012-03-211-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omhiredis: some cleanupRainer Gerhards2012-03-211-4/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial shot at omhiredisBrian Knox2012-03-218-0/+1151