summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'c9'Rainer Gerhards2013-09-0210-4/+64
|\ | | | | | | | | Conflicts: runtime/msg.c
| * doc: add "defaultTZ" param to imtcp docRainer Gerhards2013-09-021-2/+13
| |
| * apply default TZ if none is present in legacy timestampRainer Gerhards2013-09-023-1/+12
| |
| * milestone: defaultTZ can be set in msg obj (via imtcp)Rainer Gerhards2013-08-307-2/+40
| | | | | | | | ... but parser does not yet use it.
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-263-2/+4
|\|
| * bugfix: imtcp addtlframedelimiter could not be set to zeroRainer Gerhards2013-08-263-2/+4
| | | | | | | | Thanks to Chris Norton for alerting us.
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-261-4/+13
|\|
| * doc: update package doc with links to Adiscon's repositoriesFlorian Riedl2013-08-261-4/+13
| |
* | imudp: bugfix: did not compile on some platforms due to dup variableRainer Gerhards2013-08-261-2/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-262-26/+13
|\| | | | | | | | | | | Conflicts: ChangeLog doc/dev_oplugins.html
| * doc bugfix: remove no-longer existing omtemplate from developer docRainer Gerhards2013-08-262-26/+11
| | | | | | | | | | | | It was specifically mentioned as a sample for creating new plugins Thanks to Yannick Brosseau for alerting us of this problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=473
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-260-0/+0
|\| | | | | | | | | Conflicts: configure.ac
| * backport patch to fix configure setsid testRainer Gerhards2013-08-261-1/+1
| |
* | Add autoconf check for setsid().Todd Vierling2013-08-261-1/+1
| | | | | | | | | | | | | | Because of a historical typo, the simpler code path in untty() which uses the setsid() all-in-one call has never been used. Enable that check, so it will get used instead of the more complex setpgrp()/ioctl() pair on most modern OS's.
* | Merge branch 'v7-stable'Rainer Gerhards2013-08-221-2/+2
|\|
| * doc: typo fix (in directive name!)Rainer Gerhards2013-08-221-2/+2
| | | | | | | | Thanks to Martin Foot for reporting this problem.
* | Merge branch 'v7-stable'Andre Lorbach2013-08-141-2/+2
|\|
| * Removed SPACE after "MAIL FROM:" and "RCPT TO:" as RFC5321 permits spaces.Andre Lorbach2013-08-141-2/+2
| |
* | Merge branch 'v7-stable'Andre Lorbach2013-08-062-10/+8
|\| | | | | | | | | Conflicts: plugins/omprog/omprog.c
| * Using OMSRsetEntry to set the default action template in omprogAndre Lorbach2013-08-061-8/+3
| | | | | | | | If there was no default template, a segfault occured on startup.
| * Using OMSRsetEntry to set the default action template in ompipe for now.Andre Lorbach2013-08-061-1/+5
| | | | | | | | If no default template is set, a segfault occured on startup.
* | Merge branch 'v7-stable'Andre Lorbach2013-07-241-17/+13
|\|
| * Another fix for bugid# 468Andre Lorbach2013-07-241-8/+4
| | | | | | | | | | Using OMSRsetEntry now to set the default action template when using new-style config. See here for more: http://bugzilla.adiscon.com/show_bug.cgi?id=468
| * Fixing new style config format issues from bugid #468Andre Lorbach2013-07-241-9/+9
| | | | | | | | | | See http://bugzilla.adiscon.com/show_bug.cgi?id=468 Removed CNFPARAM_REQUIRED from all optional parameters.
* | Merge branch 'v7-stable'Andre Lorbach2013-07-241-6/+14
|\|
| * Fixed another issue related to http://bugzilla.adiscon.com/show_bug.cgi?id=464Andre Lorbach2013-07-241-4/+9
| | | | | | | | | | | | Added check for empty batch data in endTransaction function. Avoids sending an unneeded curlPost, can happen when elasticsearch is shutdown while sending data to.
| * Fixed a bug in curlPost related to ↵Andre Lorbach2013-07-241-2/+5
| | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=464 A Check was added for replylen before writting the 0 Byte to the end of reply data.
| * Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-230-0/+0
| | | | | | | | | | | | Added some libcurl options in checkConn to disable the bodyport of the request within this functions. Otherwise libcurl could have created a sigsegv when curl_easy_perform() was called.
| * Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-231-0/+6
| | | | | | | | | | | | Added some libcurl options in checkConn to disable the bodyport of the request within this functions. Otherwise libcurl could have created a sigsegv when curl_easy_perform() was called.
* | add $!, $., $/ to RSYSLOG_DebugFormatRainer Gerhards2013-07-231-1/+1
| | | | | | | | Thanks to David Lang for the suggestion.
* | Merge branch 'master-globalvars'Rainer Gerhards2013-07-238-24/+114
|\ \
| * | doc: add global variablesRainer Gerhards2013-07-231-6/+28
| | |
| * | add proper sync to global variablesRainer Gerhards2013-07-231-3/+17
| | |
| * | fix: global&local variables could not be accessed via RainerScriptRainer Gerhards2013-07-232-4/+8
| | | | | | | | | | | | | | | also, global variable pool did receive extra variables that did not belong to global pool (problem in last milestone commit)
| * | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-226-14/+64
| | |
* | | Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-231-0/+6
| | | | | | | | | | | | | | | | | | Added some libcurl options in checkConn to disable the bodyport of the request within this functions. Otherwise libcurl could have created a sigsegv when curl_easy_perform() was called.
* | | Added check if mainqueue cfg ptr is NULL in glblDestructMainqCnfObj function ↵Andre Lorbach2013-07-231-1/+4
|/ / | | | | | | (glbl.c)
* | update to newest version of stats scriptsAndre Lorbach2013-07-221-2/+226
| |
* | Started implementing statslog analyzer for impstatsAndre Lorbach2013-07-223-15/+73
| | | | | | | | This script will help finding unusual things in the impstats logs
* | doc: document local variables and their distinction to message JSON propertiesRainer Gerhards2013-07-211-0/+20
| |
* | Merge branch 'master-localvars'Rainer Gerhards2013-07-206-59/+175
|\ \
| * | make local vars work together with disk queuesRainer Gerhards2013-07-171-0/+8
| | |
| * | milestone: basic local variable functionality availableRainer Gerhards2013-07-176-18/+100
| | | | | | | | | | | | but some nits, like do not work with disk queues
| * | refactor in preparation of local variablesRainer Gerhards2013-07-173-41/+67
| | | | | | | | | | | | | | | local variables require a second json root; this refactoring makes sure we can basically use common functions for json handling
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-191-4/+4
|\ \ \ | | |/ | |/|
| * | debug: improve queue startup debug outputRainer Gerhards2013-07-191-4/+4
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-192-4/+41
|\| |
| * | bugfix: testbench tool chkseq did improperly report invalid fileRainer Gerhards2013-07-192-4/+41
| | | | | | | | | | | | | | | | | | This happened when permitted duplicate values existed in the very last lines, right before end-of-file. Thanks to Radu Gheorghe for reporting this bug.
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-193-3/+11
|\| | | | | | | | | | | | | | Conflicts: runtime/stream.c
| * | doc: mention queue file size patchRainer Gerhards2013-07-191-1/+4
| | |