| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 16 | -18/+176 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 4 | -2/+15 |
| | |\ | |||||
| | | * | bugfix: stopped DA queue was never processed after a restart | Rainer Gerhards | 2012-03-12 | 4 | -2/+15 |
| | | | | | | | | | | | | | ...due to a regression from statistics module. | ||||
| | * | | added capability to use a local interface IP address as fromhost-ip for imklog | Rainer Gerhards | 2012-03-10 | 4 | -4/+34 |
| | | | | |||||
| | * | | imuxsock did ignore configured IP if - always used eth0 if one was set ;) | Rainer Gerhards | 2012-03-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | bugfix: imudp: only two listeners were activated | Rainer Gerhards | 2012-03-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | no matter how many were defined. Note that IPv4 and IPv6 count as two! | ||||
| | * | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 6 | -9/+97 |
| | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-05 | 7 | -21/+34 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | preparing for 5.8.8v5.8.8 | Rainer Gerhards | 2012-03-05 | 3 | -3/+3 |
| | | | | |||||
| | * | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 2 | -6/+10 |
| | | | | |||||
| | * | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 6 | -3/+16 |
| | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
| | * | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6 | Rainer Gerhards | 2012-02-20 | 2 | -2/+4 |
| | | | | |||||
| | * | | stats: added unique (and friendly) name for ruleset queues | Rainer Gerhards | 2012-01-31 | 1 | -1/+4 |
| | | | | |||||
| | * | | stats: generate friendly name for action queues, if possible | Rainer Gerhards | 2012-01-31 | 2 | -3/+8 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-30 | 7 | -47/+63 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-02 | 2 | -2/+6 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Fix for "/run/systemd/journal/syslog" detection | Marius Tomaschewski | 2012-03-02 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated]. | ||||
| | * | | | Install syslog.service Alias for newer systemd versions | Michael Biebl | 2012-03-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the syslog.socket unit file of newer systemd versions: The default syslog implementation should make syslog.service a symlink to itself, so that this socket activates the right actual syslog service. Examples: /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service Best way to achieve that is by adding this to your unit file (i.e. to rsyslog.service or syslog-ng.service): [Install] Alias=syslog.service http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26 | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 1 | -0/+9 |
| |\| | | | |||||
| | * | | | Detect if to use /run/systemd/journal/syslog under systemd | Marius Tomaschewski | 2012-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 8 | -63/+79 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | | | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 | ||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | ommysql: put under ASL 2.0 | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 |
| | | | | | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET) | ||||
| | * | | | undoing last commit: wrong branch | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | indicated special version | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | added merged v4 bugfix info to changelog | Rainer Gerhards | 2012-01-27 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 7 | -47/+59 |
| | |\| | | |||||
| | | * | | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 3 | -0/+9 |
| | | | | | | | | | | | | | | | | | configured | ||||
| | | * | | relicense unlimited_select.h under ASL 2.0 | Rainer Gerhards | 2012-01-26 | 1 | -15/+14 |
| | | | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich) | ||||
| | | * | | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug) | ||||
| | | * | | licensing change | Rainer Gerhards | 2012-01-21 | 2 | -31/+29 |
| | | | | | |||||
| * | | | | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 | ||||
| * | | | | preparing for 5.9.6v5.9.5 | Rainer Gerhards | 2012-01-27 | 2 | -8/+4 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-27 | 3 | -3/+8 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | | bugfix: action stats did invalidly contain already-discarded messages | Rainer Gerhards | 2012-01-27 | 2 | -4/+5 |
| | | | | | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-24 | 4 | -3/+9 |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | | mentioning license change in ChangeLog | Rainer Gerhards | 2012-01-21 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
| | | |\| | |||||
| | | | * | license docs were not properly redistributed | Rainer Gerhards | 2012-01-21 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | thanks to Tomas Heinrich for alerting me. | ||||
| * | | | | imklog: forgot to remove one file; now done | Rainer Gerhards | 2012-01-23 | 1 | -35/+0 |
| | | | | | |||||
| * | | | | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 9 | -2063/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver. | ||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 |
| |\| | | | |||||
| | * | | | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 |
| | | | | | |||||
| | * | | | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 |
| | | | | | |||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 10 | -56/+404 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| | * | | | | | elasticsearch: move to asl 2.0 | Rainer Gerhards | 2012-01-17 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | email conversation Nathan/Rainer 2012-01-16&17 | ||||
| | * | | | | | add elasticsearch output module | Nathan Scott | 2012-01-17 | 5 | -0/+323 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for sending events to elasticsearch - a distributed, RESTful, search engine built on Lucene (www.elasticsearch.org). The output module is enabled via a configure option, and uses libcurl to send the messages from rsyslog to elasticsearch. This patch makes use of the earlier JSON quoting patch to ensure valid JSON strings are sent to the server. Signed-off-by: Nathan Scott <nathans@aconex.com> | ||||
| | * | | | | | add JSON escaping option | Nathan Scott | 2012-01-17 | 3 | -38/+63 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com> | ||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |