summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-195-59/+181
| | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* Merge branch 'v6-stable'Rainer Gerhards2012-04-186-5/+76
|\ | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-184-8/+45
| |\
| | * fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | | | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S
| | * bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
| * | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
| | |
| * | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵Steven A. Falco2012-04-132-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started.
* | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-162-1/+3
| | |
* | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-162-2/+5
| | |
* | | make "old" omelasticsearch compileRainer Gerhards2012-04-161-1/+0
| | | | | | | | | | | | | | | this module is to be replaced by branch currently in development. But I want to be able to compile the previous one, at least ;)
* | | preparing for 6.3.8 releasev6.3.8Rainer Gerhards2012-04-161-1/+1
| | |
* | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
| | |
* | | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
| | |
* | | Merge branch 'v6-stable'Rainer Gerhards2012-04-120-0/+0
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-129-138/+210
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-124-9/+15
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-126-120/+168
| |\ \ \
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-126-120/+168
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * | imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| | | | |
| | | * | Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | | * | Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | | * | doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | | | |
| | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
| | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
| | | | | | | | | | | | | | | | | | | | thanks to Brian Knox for alerting me and the initial analysis
* | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-075-35/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-33/+42
| | | | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion.
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-0714-123/+370
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-203-2/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-1216-18/+176
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | | | | | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-0727-87/+283
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-078-10/+238
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | | | | | | | | cosmetic: pushing temp version upRainer Gerhards2012-03-221-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-223-50/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
| * | | | | | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-216-65/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
| * | | | | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-199-10/+29
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
| * | | | | | | | | added missing initialization of stats countersRainer Gerhards2012-03-143-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch!
| * | | | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-146-38/+66
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
generated by cgit (git 2.34.1) at 2024-06-09 10:12:31 +0000