Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | impstats: reset stats counters no matter if CEE or regular mode is used | Rainer Gerhards | 2013-09-09 | 1 | -3/+17 |
| | |||||
* | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-07 | 10 | -33/+41 |
| | |||||
* | imudp: use inputname for statistics, if configured | Rainer Gerhards | 2013-09-05 | 2 | -3/+4 |
| | |||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-05 | 3 | -3/+7 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | bugfix: some more build problems with newer json-c versions | Rainer Gerhards | 2013-09-04 | 3 | -2/+6 |
| | | | | | | | | Thanks to Michael Biebl for mentioning the problem. | ||||
| * | prepare for 7.4.4 releasev7.4.4 | Rainer Gerhards | 2013-09-03 | 3 | -3/+3 |
| | | |||||
* | | doc: mention imported patches in ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 2 | -1/+9 |
|\| | |||||
| * | doc: add some more non-mentioned fixes to ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+4 |
| | | |||||
| * | regression fix: previous fix introduced wrong default template | Rainer Gerhards | 2013-09-03 | 1 | -1/+1 |
| | | | | | | | | The faulty code was never released. | ||||
| * | doc: add missing information (patches) to ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 13 | -15/+20 |
|\| | |||||
| * | doc: mention last json-c patch in ChangeLog | Rainer Gerhards | 2013-09-03 | 1 | -0/+2 |
| | | |||||
| * | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 12 | -15/+18 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 2 | -1/+4 |
|\| | |||||
| * | bugfix: imfile parameter "persistStateInterval" was unusable | Rainer Gerhards | 2013-09-02 | 2 | -1/+4 |
| | | | | | | | | | | due to a case typo in imfile; work-around was to use legacy config Thanks to Brandon Murphy for reporting this bug. | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 5 | -9/+24 |
|\| | |||||
| * | doc: add recent patch series to ChangeLog | Rainer Gerhards | 2013-09-02 | 1 | -0/+8 |
| | | |||||
| * | Using more appropriate helper function to get the error message | Ahto Truu | 2013-09-02 | 1 | -1/+1 |
| | | |||||
| * | Better error messages from rsgtutil | Ahto Truu | 2013-09-02 | 1 | -4/+4 |
| | | |||||
| * | More careful TLV encoding/decoding | Ahto Truu | 2013-09-02 | 3 | -4/+11 |
| | | |||||
* | | 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. |