Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 3 | -2/+3 |
|\ | |||||
| * | property replacer lost one char when json escaping was necessary | Rainer Gerhards | 2012-05-21 | 1 | -1/+1 |
| * | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 1 | -0/+1 |
| * | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 12 | -159/+438 |
| |\ | |||||
| * | | permitting plugins to use three string requests | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
| * | | omelasticsearch: used new property replacer options for default template | Rainer Gerhards | 2012-04-05 | 1 | -1/+1 |
* | | | improve invalid config command error message | Rainer Gerhards | 2012-06-27 | 1 | -1/+2 |
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+13 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| |\ \ \ | |||||
| | * | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| * | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 1 | -0/+5 |
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-06 | 5 | -33/+26 |
| |\| | | | |||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 3 | -13/+17 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 5 | -33/+26 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 5 | -33/+26 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | bugfix: property PROCID was empty instead of proper nilvalue if not present | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 |
| | * | | | | | bugfix: potential hang due to mutex deadlock | Rainer Gerhards | 2012-06-06 | 3 | -29/+10 |
| | * | | | | | fixing memleak in recent group resolve patch | Rainer Gerhards | 2012-06-06 | 1 | -3/+6 |
| | * | | | | | call getgrnam_r repeatedly to get all group members. | Alec Warner | 2012-06-06 | 1 | -3/+12 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | fixing small memleak during config read phase | Rainer Gerhards | 2012-06-05 | 1 | -0/+1 |
* | | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 1 | -10/+16 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -10/+16 |
| |\| | | | | |||||
| | * | | | | some better code to handle queue congestion | Rainer Gerhards | 2012-06-01 | 1 | -10/+15 |
* | | | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-05-29 | 2 | -3/+2 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 2 | -3/+2 |
| |\| | | | | |||||
| | * | | | | bugfix: if debug message could end up in log file when forking | Tomas Heinrich | 2012-05-29 | 2 | -3/+2 |
| * | | | | | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -11/+5 |
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
| |\| | | | | |||||
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -13/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | cleanup: removing no longer needed macros | Rainer Gerhards | 2012-05-04 | 1 | -13/+0 |
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -7/+47 |
| |\| | | | | |||||
| * | | | | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| |\ \ \ \ \ | |||||
| | * | | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| * | | | | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | Merge branch 'v6-stable' | Rainer Gerhards | 2012-05-03 | 1 | -6/+47 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -7/+47 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | bugfix: rsyslog did not terminate when delayable inputs were blocked | Rainer Gerhards | 2012-05-03 | 1 | -5/+42 |
| | * | | | | | | | bugfix: inside queue.c, some thread cancel states were not correctly reset. | Rainer Gerhards | 2012-05-03 | 1 | -5/+4 |
| | * | | | | | | | bugfix: active input in "light delay state" could block rsyslog termination | Rainer Gerhards | 2012-04-27 | 1 | -0/+4 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | better debug instrumentation --> input thread names used for reporting | Rainer Gerhards | 2012-05-02 | 1 | -1/+2 |
* | | | | | | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -55/+57 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -37/+93 |
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-04-18 | 4 | -5/+64 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-18 | 3 | -8/+41 |
| |\| | | | | | |||||
| | * | | | | | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | |