Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'c9' | Rainer Gerhards | 2013-09-02 | 10 | -4/+64 |
|\ | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | doc: add "defaultTZ" param to imtcp doc | Rainer Gerhards | 2013-09-02 | 1 | -2/+13 |
| | | |||||
| * | apply default TZ if none is present in legacy timestamp | Rainer Gerhards | 2013-09-02 | 3 | -1/+12 |
| | | |||||
| * | milestone: defaultTZ can be set in msg obj (via imtcp) | Rainer Gerhards | 2013-08-30 | 7 | -2/+40 |
| | | | | | | | | ... but parser does not yet use it. | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-08-26 | 3 | -2/+4 |
|\| | |||||
| * | bugfix: imtcp addtlframedelimiter could not be set to zero | Rainer Gerhards | 2013-08-26 | 3 | -2/+4 |
| | | | | | | | | Thanks to Chris Norton for alerting us. | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-08-26 | 1 | -4/+13 |
|\| | |||||
| * | doc: update package doc with links to Adiscon's repositories | Florian Riedl | 2013-08-26 | 1 | -4/+13 |
| | | |||||
* | | imudp: bugfix: did not compile on some platforms due to dup variable | Rainer Gerhards | 2013-08-26 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-08-26 | 2 | -26/+13 |
|\| | | | | | | | | | | | Conflicts: ChangeLog doc/dev_oplugins.html | ||||
| * | doc bugfix: remove no-longer existing omtemplate from developer doc | Rainer Gerhards | 2013-08-26 | 2 | -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 Gerhards | 2013-08-26 | 0 | -0/+0 |
|\| | | | | | | | | | Conflicts: configure.ac | ||||
| * | backport patch to fix configure setsid test | Rainer Gerhards | 2013-08-26 | 1 | -1/+1 |
| | | |||||
* | | Add autoconf check for setsid(). | Todd Vierling | 2013-08-26 | 1 | -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 Gerhards | 2013-08-22 | 1 | -2/+2 |
|\| | |||||
| * | doc: typo fix (in directive name!) | Rainer Gerhards | 2013-08-22 | 1 | -2/+2 |
| | | | | | | | | Thanks to Martin Foot for reporting this problem. | ||||
* | | Merge branch 'v7-stable' | Andre Lorbach | 2013-08-14 | 1 | -2/+2 |
|\| | |||||
| * | Removed SPACE after "MAIL FROM:" and "RCPT TO:" as RFC5321 permits spaces. | Andre Lorbach | 2013-08-14 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Andre Lorbach | 2013-08-06 | 2 | -10/+8 |
|\| | | | | | | | | | Conflicts: plugins/omprog/omprog.c | ||||
| * | Using OMSRsetEntry to set the default action template in omprog | Andre Lorbach | 2013-08-06 | 1 | -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 Lorbach | 2013-08-06 | 1 | -1/+5 |
| | | | | | | | | If no default template is set, a segfault occured on startup. | ||||
* | | Merge branch 'v7-stable' | Andre Lorbach | 2013-07-24 | 1 | -17/+13 |
|\| | |||||
| * | Another fix for bugid# 468 | Andre Lorbach | 2013-07-24 | 1 | -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 #468 | Andre Lorbach | 2013-07-24 | 1 | -9/+9 |
| | | | | | | | | | | See http://bugzilla.adiscon.com/show_bug.cgi?id=468 Removed CNFPARAM_REQUIRED from all optional parameters. | ||||
* | | Merge branch 'v7-stable' | Andre Lorbach | 2013-07-24 | 1 | -6/+14 |
|\| | |||||
| * | Fixed another issue related to http://bugzilla.adiscon.com/show_bug.cgi?id=464 | Andre Lorbach | 2013-07-24 | 1 | -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 Lorbach | 2013-07-24 | 1 | -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 module | Andre Lorbach | 2013-07-23 | 0 | -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 module | Andre Lorbach | 2013-07-23 | 1 | -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_DebugFormat | Rainer Gerhards | 2013-07-23 | 1 | -1/+1 |
| | | | | | | | | Thanks to David Lang for the suggestion. | ||||
* | | Merge branch 'master-globalvars' | Rainer Gerhards | 2013-07-23 | 8 | -24/+114 |
|\ \ | |||||
| * | | doc: add global variables | Rainer Gerhards | 2013-07-23 | 1 | -6/+28 |
| | | | |||||
| * | | add proper sync to global variables | Rainer Gerhards | 2013-07-23 | 1 | -3/+17 |
| | | | |||||
| * | | fix: global&local variables could not be accessed via RainerScript | Rainer Gerhards | 2013-07-23 | 2 | -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 Gerhards | 2013-07-22 | 6 | -14/+64 |
| | | | |||||
* | | | Fixed bugid #464 in elasticsearch output module | Andre Lorbach | 2013-07-23 | 1 | -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 Lorbach | 2013-07-23 | 1 | -1/+4 |
|/ / | | | | | | | (glbl.c) | ||||
* | | update to newest version of stats scripts | Andre Lorbach | 2013-07-22 | 1 | -2/+226 |
| | | |||||
* | | Started implementing statslog analyzer for impstats | Andre Lorbach | 2013-07-22 | 3 | -15/+73 |
| | | | | | | | | This script will help finding unusual things in the impstats logs | ||||
* | | doc: document local variables and their distinction to message JSON properties | Rainer Gerhards | 2013-07-21 | 1 | -0/+20 |
| | | |||||
* | | Merge branch 'master-localvars' | Rainer Gerhards | 2013-07-20 | 6 | -59/+175 |
|\ \ | |||||
| * | | make local vars work together with disk queues | Rainer Gerhards | 2013-07-17 | 1 | -0/+8 |
| | | | |||||
| * | | milestone: basic local variable functionality available | Rainer Gerhards | 2013-07-17 | 6 | -18/+100 |
| | | | | | | | | | | | | but some nits, like do not work with disk queues | ||||
| * | | refactor in preparation of local variables | Rainer Gerhards | 2013-07-17 | 3 | -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 Gerhards | 2013-07-19 | 1 | -4/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | debug: improve queue startup debug output | Rainer Gerhards | 2013-07-19 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 2 | -4/+41 |
|\| | | |||||
| * | | bugfix: testbench tool chkseq did improperly report invalid file | Rainer Gerhards | 2013-07-19 | 2 | -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 Gerhards | 2013-07-19 | 3 | -3/+11 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/stream.c | ||||
| * | | doc: mention queue file size patch | Rainer Gerhards | 2013-07-19 | 1 | -1/+4 |
| | | |