Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-lookup' | Rainer Gerhards | 2013-10-13 | 8 | -1/+449 |
|\ | | | | | | | | | | | Conflicts: grammar/rainerscript.h runtime/rsyslog.h | ||||
| * | reload lookup tables on HUP | Rainer Gerhards | 2013-07-16 | 2 | -2/+53 |
| | | |||||
| * | add base plumbing for (later) dynamic table reload | Rainer Gerhards | 2013-07-16 | 2 | -9/+22 |
| | | | | | | | | | | among others, we change some internal interfaces. So far, we only add the necessary locks. More work in later commits. | ||||
| * | milestone: basic lookup() functionality is present | Rainer Gerhards | 2013-07-10 | 2 | -8/+54 |
| | | | | | | | | done the naive way, string indzes only | ||||
| * | milestone: completed string lookup table load (naive version) | Rainer Gerhards | 2013-07-10 | 3 | -1/+60 |
| | | |||||
| * | milestone: read in lookup table file & json parse it | Rainer Gerhards | 2013-07-09 | 2 | -0/+78 |
| | | |||||
| * | milestone: lookup table ready for actual load (but load not yet done) | Rainer Gerhards | 2013-07-09 | 6 | -9/+60 |
| | | |||||
| * | milestone: add lookup_table stmt to RainerScript | Rainer Gerhards | 2013-07-09 | 4 | -5/+44 |
| | | | | | | | | ... but still does nothing execpt calling the handler. | ||||
| * | add lookup table sekeleton to build system | Rainer Gerhards | 2013-07-05 | 4 | -0/+111 |
| | | |||||
* | | change main/ruleset queue defaults to be more enterprise-like | Rainer Gerhards | 2013-10-04 | 2 | -9/+11 |
| | | | | | | | | | | | | | | new defaults are queue.size 100,000 max workers 2, worker activation after 40,000 msgs are queued, batch size 256. These settings are much more useful for enterprises and will not hurt low-end systems that much. This is part of our re-focus on enterprise needs. | ||||
* | | omfwd: new action parameter "maxErrorMessages" added | Rainer Gerhards | 2013-09-30 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 1 | -2/+6 |
|\ \ | |||||
| * | | mmrfc5424addhmac: correctly handle empty structured data | Rainer Gerhards | 2013-09-26 | 1 | -2/+6 |
| | | | |||||
* | | | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 3 | -47/+68 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/msg.c runtime/rsyslog.h | ||||
| * | | mmrfc5424addhmac: complete initial implementation | Rainer Gerhards | 2013-09-25 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | hash is now also persisted back to structured-data rsyslog property | ||||
| * | | simplify STRUCTURED-DATA representation in msg object | Rainer Gerhards | 2013-09-25 | 2 | -19/+23 |
| | | | |||||
| * | | milestone: mmpstrucdata parses STRUCTURED-DATA (but does not yet store it) | Rainer Gerhards | 2013-09-23 | 2 | -0/+7 |
| | | | |||||
| * | | expose so-far msg-internal method to query structured data | Rainer Gerhards | 2013-09-23 | 2 | -22/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | This also lead to a slight performance optimization in the msg.c module (when it comes to querying structured data). This is stage work in order to provide the capability to fully parse structured data. | ||||
| * | | mmrfc5424addhmac milestone: do not process non-rfc5424 messages | Rainer Gerhards | 2013-09-23 | 2 | -10/+12 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-26 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | remove no-longer needed data item | Rainer Gerhards | 2013-09-25 | 1 | -1/+0 |
| |/ / | |||||
* | | | imtcp: add streamdriver.name module parameter | Rainer Gerhards | 2013-09-17 | 4 | -3/+54 |
| | | | | | | | | | | | | permits overriding the system default stream driver (gtls, ptcp) | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-13 | 2 | -3/+21 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | bugfix: segfault on startup if TCP TLS was used but no cert or key set | Rainer Gerhards | 2013-09-13 | 2 | -1/+13 |
| | | | |||||
| * | | Merge branch 'v7-stable' into v7-stable-tlsfix | Rainer Gerhards | 2013-09-13 | 61 | -869/+5925 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| | * | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem Conflicts: ChangeLog runtime/cryprov.h | ||||
| * | | | bugfix: segfault on startup if TLS was used but no CA cert set | Rainer Gerhards | 2013-09-13 | 2 | -2/+8 |
| | | | | |||||
* | | | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem | ||||
* | | | | regression fix: message properties did not work | Rainer Gerhards | 2013-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | This was a regeression from the global/local variabe work done for this release. Consequently, this problem did not occur in any released version. | ||||
* | | | | imfile: support LF escaping in read mode 2 | Rainer Gerhards | 2013-09-10 | 1 | -6/+16 |
| | | | | |||||
* | | | | imfile: support LF escaping in read mode 1 | Rainer Gerhards | 2013-09-10 | 2 | -6/+16 |
| | | | | |||||
* | | | | impstats: implement parameter "resetCounters" | Rainer Gerhards | 2013-09-09 | 2 | -14/+15 |
| | | | | | | | | | | | | | | | | | | | | it provides the capability to make impstats emit deltas in contrast to accumulated counter values (see doc for details). | ||||
* | | | | 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 | 3 | -9/+17 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-05 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | bugfix: some more build problems with newer json-c versions | Rainer Gerhards | 2013-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning the problem. | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 3 | -5/+6 |
|\| | | | |||||
| * | | | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 3 | -5/+6 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 3 | -5/+12 |
|\| | | | |||||
| * | | | Using more appropriate helper function to get the error message | Ahto Truu | 2013-09-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | More careful TLV encoding/decoding | Ahto Truu | 2013-09-02 | 3 | -4/+11 |
| | | | | |||||
* | | | | Merge branch 'c9' | Rainer Gerhards | 2013-09-02 | 4 | -1/+23 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | | | apply default TZ if none is present in legacy timestamp | Rainer Gerhards | 2013-09-02 | 2 | -0/+10 |
| | | | | | |||||
| * | | | | milestone: defaultTZ can be set in msg obj (via imtcp) | Rainer Gerhards | 2013-08-30 | 2 | -1/+13 |
| |/ / / | | | | | | | | | | | | | ... but parser does not yet use it. | ||||
* | | | | 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 | 5 | -12/+64 |
|\ \ \ \ | |||||
| * | | | | 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 | 4 | -8/+42 |
| | | | | | |||||
* | | | | | Added check if mainqueue cfg ptr is NULL in glblDestructMainqCnfObj function ↵ | Andre Lorbach | 2013-07-23 | 1 | -1/+4 |
|/ / / / | | | | | | | | | | | | | (glbl.c) |