summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* impstats: reset stats counters no matter if CEE or regular mode is usedRainer Gerhards2013-09-091-3/+17
|
* experimental: make impstats return delta values where possibleRainer Gerhards2013-09-0710-33/+41
|
* imudp: use inputname for statistics, if configuredRainer Gerhards2013-09-052-3/+4
|
* Merge branch 'v7-stable'Rainer Gerhards2013-09-053-3/+7
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: some more build problems with newer json-c versionsRainer Gerhards2013-09-043-2/+6
| | | | | | | | Thanks to Michael Biebl for mentioning the problem.
| * prepare for 7.4.4 releasev7.4.4Rainer Gerhards2013-09-033-3/+3
| |
* | doc: mention imported patches in ChangeLogRainer Gerhards2013-09-031-0/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-032-1/+9
|\|
| * doc: add some more non-mentioned fixes to ChangeLogRainer Gerhards2013-09-031-0/+4
| |
| * regression fix: previous fix introduced wrong default templateRainer Gerhards2013-09-031-1/+1
| | | | | | | | The faulty code was never released.
| * doc: add missing information (patches) to ChangeLogRainer Gerhards2013-09-031-0/+4
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-0313-15/+20
|\|
| * doc: mention last json-c patch in ChangeLogRainer Gerhards2013-09-031-0/+2
| |
| * make rsyslog use the new json-c pkgconfig file if availablehwoarang2013-09-0312-15/+18
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-022-1/+4
|\|
| * bugfix: imfile parameter "persistStateInterval" was unusableRainer Gerhards2013-09-022-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 Gerhards2013-09-025-9/+24
|\|
| * doc: add recent patch series to ChangeLogRainer Gerhards2013-09-021-0/+8
| |
| * Using more appropriate helper function to get the error messageAhto Truu2013-09-021-1/+1
| |
| * Better error messages from rsgtutilAhto Truu2013-09-021-4/+4
| |
| * More careful TLV encoding/decodingAhto Truu2013-09-023-4/+11
| |
* | 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.