summaryrefslogtreecommitdiffstats
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* preparing for 6.1.8 releasev6.1.8Rainer Gerhards2011-05-211-0/+1
|
* Merge branch 'v5-stable' into betaRainer Gerhards2011-05-201-0/+5
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
| * added skeleton for mmsnmptrapdRainer Gerhards2011-05-051-0/+5
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-0/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * prepared skeleton for new strgen moduleRainer Gerhards2011-03-171-0/+4
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-141-0/+2
|\| | | | | | | | | Conflicts: tests/diag.sh
| * added the template modules to the things being checked during distcheckRainer Gerhards2011-03-141-0/+2
| | | | | | | | | | | | | | While they are not meant for production, interface changes may not show up if they are not included in distecheck. This may be distrubing to users. The chances is even greater as there usually is no need to compile and/or check these modules during regular development.
* | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * fixed problem in testbench Makefile, added module to distcheckRainer Gerhards2011-03-101-0/+3
| | | | | | | | | | Thanks to Michael Biebl for mentioning that some modules were not included in make distcheck.
| * systemd: use standard syslog.socket unitLennart Poettering2011-03-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In systemd we now have a standard socket unit for /dev/log called syslog.socket. This unit can be shared between an early boot mini syslog and the full syslog implementation started later on. The mini syslog is shipped along systemd and does nothing but simply forward the data received through /dev/log to the kernel log buffer (i.e. kmsg, as visible by dmesg). It is run during early boot, and then as soon as rsyslog starts up it is terminated, so that rsyslog can take over the /dev/log socket. Since one of the first things rsyslog does after starting up is flushing the kernel log buffer to disk we end up with all data from early boot up in syslog. This patch changes two things: removes rsyslog.socket and instead configures rsyslog.service to take possession of syslock.socket. And secondly includes a PreStart line to terminate the running syslog bridge instance.
* | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-0/+4
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * added pmsnare parser moduleDavid Lang2011-02-081-0/+4
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v5-devel'Rainer Gerhards2011-02-011-0/+8
|\| | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c
| * added pmaixforwardedfrom message parserDavid Lang2011-02-011-0/+4
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * integrated pmciscomsg into the build systemRainer Gerhards2011-01-131-0/+4
| |
* | added first (very experimental) version of imttcpRainer Gerhards2011-01-241-1/+5
| |
* | milestone: added mmnormalize (compiles, but untested)Rainer Gerhards2010-12-011-0/+4
|/
* Merge branch 'v5-beta' into v5-develRainer Gerhards2010-10-151-1/+1
|\ | | | | | | | | | | | | | | Conflicts: Makefile.am plugins/imfile/imfile.c runtime/stream.c tests/tcpflood.c
| * Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+5
| |\ | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
* | \ Merge branch 'v5-devel-hdfs' into v5-develRainer Gerhards2010-10-051-0/+4
|\ \ \
| * | | omhdfs: first shot at this new module (very rough PoC code)Rainer Gerhards2010-09-301-0/+4
| | | |
* | | | systemd: install service and socket unit filesLennart Poettering2010-10-041-2/+23
|/ / / | | | | | | | | | | | | | | | | | | This adds a systemd socket and service unit file to the default install if systemd is found or explicitly enabled in ./configure. Patch is against current git v5-devel.
* | | added module impstat to emit periodic statistics on rsyslog countersRainer Gerhards2010-09-091-0/+5
| | | | | | | | | | | | | | | | | | This is a *very first* and *very rough* and *very featureless* first shot at this functionality. It is assumed that we will enhance the stats system as a by-line while doing other development.
* | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-111-0/+5
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: Makefile.am tests/tcpflood.c
| * Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * added imptcpRainer Gerhards2010-08-101-1/+6
| | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
* | | fixing a nit introduced in last mergeRainer Gerhards2010-08-061-0/+1
| | |
* | | Merge branch 'v4-devel'Rainer Gerhards2010-08-061-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/rsyslog_conf_modules.html runtime/rsyslog.h tests/Makefile.am
| * | added omuxsock, which permits to write message to local Unix socketsRainer Gerhards2010-08-061-1/+6
| | | | | | | | | | | | this is the counterpart to imuxsock, enabling fast local forwarding
* | | preparing for 5.5.6 releasev5.5.6Rainer Gerhards2010-07-211-2/+0
| | |
* | | added new parser modulesRainer Gerhards2010-07-131-1/+5
| | | | | | | | | | | | | | | | | | | | | most importantly pmlastmsg, which handles the pathetic "last message repeated n times" messages that some syslogd's emit. Also some minor fixes, like wrong files names in make dist (for new files introduced after last release)
* | | added new pm3164sd parser moduleRainer Gerhards2010-07-071-0/+5
| | | | | | | | | | | | | | | | | | this permits to accept RFC5424 structured data from messages with RFC3164 header. This was compiled from existing modules by user izotov.
* | | some cleanupRainer Gerhards2010-04-191-1/+21
| | |
* | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-191-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html runtime/debug.c runtime/rsyslog.h tests/Makefile.am tests/diag.sh tests/nettester.c tools/syslogd.c
| * | first version of imsolaris created, cleanup for solaris doneRainer Gerhards2010-04-151-2/+2
| | | | | | | | | | | | more cleanup required, but things now basically work
| * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-04-121-1/+1
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * added new configure option that permits to disable and enable an extended ↵Rainer Gerhards2010-04-121-1/+1
| | | | | | | | | | | | testbench
* | | Merge branch 'beta' into masterRainer Gerhards2010-04-091-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
| * | | Merge branch 'v4-stable-solaris' into betaRainer Gerhards2010-04-091-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
| | * | added initial files for door support & fixed imklogRainer Gerhards2010-03-261-0/+4
| | |/ | | | | | | | | | imklog now basically works, but needs quite some more work to do
* | / added a skeleton for omdbalerting by request of Phil ReillyRainer Gerhards2009-11-171-0/+4
|/ / | | | | | | | | | | ... who intends to add a database-driven alert functionality. The change provides the necessary rsyslog plumbing, but no functionality at all.
* | added omruleset output module, which provides great flexibility in action ↵Rainer Gerhards2009-11-021-1/+5
| | | | | | | | | | | | processing. THIS IS A VERY IMPORTANT ADDITION, see its doc for why.
* | enhanced test environment (including testbench)Rainer Gerhards2009-10-221-1/+1
| | | | | | | | | | | | | | | | support for enhancing probability of memory addressing failure by using non-NULL default value for malloced memory (optional, only if requested by configure option). This helps to track down some otherwise undetected issues within the testbench and is expected to be very useful in the future.
* | added --enable-gui configure switchRainer Gerhards2009-08-271-0/+2
| | | | | | | | | | ... which now permits to enable/disable GUI components. This also checks if Java is present and, if not, complains during ./configure.
* | Merge branch 'master' into javaRainer Gerhards2009-08-271-1/+0
|\ \
| * | Merge branch 'beta'Rainer Gerhards2009-08-261-1/+0
| |\|
| | * features requiring Java are automatically disabled if Java is not presentRainer Gerhards2009-08-251-1/+0
| | | | | | | | | | | | (thanks to Michael Biebl for his help!)
* | | added a (very, very basic) build system for the Java GUIRainer Gerhards2009-08-271-0/+2
|/ / | | | | | | | | | | ... so far, this can not be turned off (will do when I have merged the recent build system changes into this branch - I am glad that I at least have a working reference point now ;)).
* / first version supporting udp spoofing and non-spoofing at the same timeRainer Gerhards2009-07-091-0/+4
|/ | | | | | omudpspoof is now a dedicated output module. It's calling semantics so far are based on omfwd, plus the need for the template to have the IP address as a string in the starting position.
* added support for custom modulesRainer Gerhards2009-06-021-0/+4
| | | | | | ... this provides some basic support to integrate extensions that are not direct parts of rsyslog to be built during its build process.