summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-1/+19
|\
| * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-031-1/+11
| * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-031-1/+9
| * bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
* | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-191-2/+2
|\ \
| * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-8/+7
|\| |
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-8/+7
| |\|
| | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-073-56/+3
|\| |
| * | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-222-49/+2
| * | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-7/+1
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-2/+13
|\| |
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-3/+14
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-193-3/+8
|\| |
| * | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-193-3/+8
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-143-0/+5
|\| |
| * | added missing initialization of stats countersRainer Gerhards2012-03-142-0/+2
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\|
| | * changed statsobj interface and added better docRainer Gerhards2012-03-141-1/+4
* | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-124-8/+62
|\| |
| * | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-101-1/+26
| * | 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-061-5/+30
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-053-18/+28
| |\|
| * | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6Rainer Gerhards2012-02-201-1/+3
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-303-31/+35
| |\ \
* | \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-021-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
|\| | |
| * | | Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-014-47/+49
|\| | |
| * | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\ \ \ | | |_|/ | |/| |
| | * | ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-31/+35
| |\| |
| | * | bugfix: omprog made rsyslog abort on startup if not binary to execute was con...Rainer Gerhards2012-01-271-0/+6
| | * | licensing changeRainer Gerhards2012-01-212-31/+29
* | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
* | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
* | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-237-2063/+170
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
|\ \ \ \ | | |_|/ | |/| |
| * | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| * | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| |\| |
* | | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-173-17/+294
|\ \ \ \
| * | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| * | | | add elasticsearch output moduleNathan Scott2012-01-172-0/+279
| | |/ / | |/| |
| * | | licensing updateRainer Gerhards2012-01-161-17/+16