| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | omelasticsearch: bugfix: bulkmode setting was not properly initialized | Rainer Gerhards | 2012-06-13 | 1 | -0/+1 |
| | | |||||
| * | omelasticsearch: dyn index&type now also supported in bulk mode | Rainer Gerhards | 2012-05-28 | 1 | -4/+7 |
| | | |||||
| * | omelasticsearc: milestone, bulk insert basically works | Rainer Gerhards | 2012-05-25 | 1 | -50/+65 |
| | | | | | | dynamic index&type is not yet used, but easy to add (did not manage to get it in today...) | ||||
| * | omelasticsearch: test commit, first shot at bulk interface | Rainer Gerhards | 2012-05-25 | 1 | -11/+85 |
| | | | | | | This obviously does not work correctly. So expect problems if you set bulkmode="on". | ||||
| * | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 3 | -3/+39 |
| | | |||||
| * | property replacer lost one char when json escaping was necessary | Rainer Gerhards | 2012-05-21 | 1 | -1/+1 |
| | | | | | The character immediately in front of the first escape was lost. | ||||
| * | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 2 | -0/+29 |
| | | |||||
| * | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 39 | -316/+825 |
| |\ | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| | * | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-19 | 1 | -0/+4 |
| | |\ | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c | ||||
| | | * | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 2 | -2/+6 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | | | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | | | |\ | |||||
| | | | | * | doc: added last bugfix to ChangeLog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | | | | | | |||||
| | | | | * | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect | ||||
| | | | * | | doc: add last bugfix to changelog | Rainer Gerhards | 2012-04-19 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | and bump up version | ||||
| | | | * | | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect | ||||
| | | * | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 4 | -5/+45 |
| | | |\| | | |||||
| | | | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 0 | -0/+0 |
| | | | |\| | |||||
| | | | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 4 | -5/+45 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | * | | | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 5 | -59/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary | ||||
| | * | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 6 | -5/+76 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h | ||||
| | | * \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-18 | 4 | -8/+45 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -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 queues | Rainer Gerhards | 2012-04-18 | 4 | -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 property | Rainer Gerhards | 2012-04-13 | 1 | -0/+4 |
| | | | | | | | |||||
| | | * | | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵ | Steven A. Falco | 2012-04-13 | 2 | -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 used | Rainer Gerhards | 2012-04-16 | 2 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | bugfix/imuxsock: solving abort if hostname was not set | Rainer Gerhards | 2012-04-16 | 2 | -2/+5 |
| | | | | | | | |||||
| | * | | | | | make "old" omelasticsearch compile | Rainer Gerhards | 2012-04-16 | 1 | -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.8 | Rainer Gerhards | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | bugfix: report error if module tries to request more strings than supported | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
| | | | | | | | |||||
| | * | | | | | imuxsock: mini bugfix: closed fd was tried to close a second time | Rainer Gerhards | 2012-04-13 | 1 | -3/+6 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-12 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 6 | -136/+171 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 9 | -138/+210 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c | ||||
| | | * | | | | preparing for 5.9.6v5.9.6 | Rainer Gerhards | 2012-04-12 | 4 | -9/+15 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 6 | -120/+168 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 6 | -120/+168 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | | | | * | | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 2 | -11/+5 |
| | | | | | | | |||||
| | | | | * | | Free also LocalDomain in glbl class destructor | Marius Tomaschewski | 2012-04-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| | | | | * | | Allocate LocalDomain as new string | Marius Tomaschewski | 2012-04-11 | 1 | -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 bugfix | Rainer Gerhards | 2012-04-11 | 1 | -1/+2 |
| | | | | | | | |||||
| | | | | * | | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 5 | -125/+161 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
| | * | | | | | imuxsock: fixed regression from last merge | Rainer Gerhards | 2012-04-11 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | thanks to Brian Knox for alerting me and the initial analysis | ||||
| | * | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 5 | -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 parameters | Rainer Gerhards | 2012-04-07 | 3 | -33/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
| | | * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 14 | -123/+370 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| | | * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 3 | -2/+23 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| | | * \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 9 | -10/+30 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h | ||||
| | | * \ \ \ \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 9 | -38/+69 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | | | | | | | cosmetic: removed stray definition | Rainer Gerhards | 2012-03-12 | 1 | -1/+0 |
| | | | | | | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |