Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added mmjsonparse to support recognizing and parsing JSON enhanced syslog ↵ | Rainer Gerhards | 2012-02-21 | 1 | -1/+19 |
| | | | | messages | ||||
* | dns cache: working on invalid resolution bug, again | Rainer Gerhards | 2012-02-09 | 1 | -1/+1 |
| | | | | the proposed solution did not work out well... | ||||
* | preparing for 6.3.7 | Rainer Gerhards | 2012-01-31 | 1 | -1/+1 |
| | |||||
* | cleanup: remove omdbalerting | Rainer Gerhards | 2012-01-27 | 1 | -16/+0 |
| | | | | | | | | someone claimed to write a module with this functionality, if a template were provided. And indeed, it was provided but never anything happend (at least nothing was contributed back...). Removing this silly template now. If someone really intends to take up on it, get a copy from older git versions. | ||||
* | Merge branch 'v5-devel' & fix bug in BSD imklog driver | Rainer Gerhards | 2012-01-23 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c | ||||
| * | refactored imklog linux driver, now combined with BSD driver | Rainer Gerhards | 2012-01-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | 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-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -0/+36 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -0/+36 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| | * | add elasticsearch output module | Nathan Scott | 2012-01-17 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| | * | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| | | | |||||
| | * | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | | |||||
| | * | preparing for 5.8.5 releasev5.8.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.9.3 releasev5.9.3 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
| | * | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
| | | | |||||
| | * | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
| * | | preparing for 5.9.2v5.9.2 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | removed imtemplate/omtemplate template modules, as this was waste of time | Rainer Gerhards | 2012-01-09 | 1 | -45/+1 |
| | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was. | ||||
* | | | preparing for 6.3.6 releasev6.3.6 | Rainer Gerhards | 2011-09-19 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.3.5 release | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.3.4 releasev6.3.4 | Rainer Gerhards | 2011-08-02 | 1 | -1/+1 |
| | | | |||||
* | | | build system cleanup/improvement | Rainer Gerhards | 2011-07-22 | 1 | -6/+0 |
| | | | |||||
* | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -1/+1 |
| | | | |||||
* | | | preparing for 6.3.3v6.3.3 | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -2/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | milestone/[PARTWORK]: obtaining msg vars integrated, "==" works for strings | Rainer Gerhards | 2011-07-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | milestone/[NONWORKING]: first integration of new parser, rules are not yet ↵ | Rainer Gerhards | 2011-07-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | handled | ||||
| * | | | milestone: grammar integrated in rsyslog build system | Rainer Gerhards | 2011-07-05 | 1 | -1/+5 |
| | | | | |||||
* | | | | preparing for 6.3.2v6.3.2 | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | doc: ./configure --help invalidly showed imdiag enabled by default | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Frédéric L. W. Meunier for bringing this to my attention. | ||||
| | | * | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | prepare for 6.1.10v6.1.10 | Rainer Gerhards | 2011-06-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 6.1.9 releasev6.1.9 | Rainer Gerhards | 2011-06-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -0/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c | ||||
| * | | | | added support for obtaining timestamp from system for imuxsock | Rainer Gerhards | 2011-06-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permits to read the time a message was submitted to the system log socket. Most importantly, this is provided in microsecond resolution. So we are able to obtain high precision timestampis even for messages that were - as is usual - not formatted with them. This also simplifies things in regard to local time calculation in chroot environments. Many thanks to Lennart Poettering for suggesting this feature, providing some guidance on implementing it and coordinating getting the necessary support into the Linux kernel. | ||||
| * | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | preparing for 6.3.1 releasev6.3.1 | Rainer Gerhards | 2011-06-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | preparing for 6.3.0v6.3.0 | Rainer Gerhards | 2011-06-01 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | preparing for 6.1.8 releasev6.1.8 | Rainer Gerhards | 2011-05-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 1 | -0/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c |