summaryrefslogtreecommitdiffstats
path: root/plugins/imklog/imklog.c
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: removed unused but set parametersRainer Gerhards2012-04-231-2/+0
|
* Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-23/+1
| | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
| * added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-101-1/+26
| |
* | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-2/+2
|\|
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | Merge branch 'v6-stable'Rainer Gerhards2012-01-271-16/+15
|\| | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-271-16/+15
| |\
| | * licensing changeRainer Gerhards2012-01-211-16/+15
| | |
* | | Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-231-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c
| * | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-231-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, resulting in much smaller code. Linux and BSD are now covered by a single small driver.
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * | | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-9/+9
| | | | | | | | | | | | | | | | | | | | The most common files are now changed, more needs to be done.
* | | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-8/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-241-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation.
* | | | | step: imklog (linux) moved to v2 config systemRainer Gerhards2011-05-251-60/+122
| | | | |
* | | | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | as far as we know that new interface right now ;)
* | | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-0/+30
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-261-4/+20
|\| | | | | |/ / / |/| | | | | | | | | | | Conflicts: tools/omfile.c
| * | | experimental: support for systemd-induced second PRI in klogRainer Gerhards2011-03-181-4/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if systemd writes a kernel log entry with a non-kernel priority, the priority recorded in the kernel log will be wrong. However, it will be immediately followed by another priority (with the kernel timestamp in between, if enabled). So imklog now tries to see if there is a second PRI and, if so, uses it. Note that we already support non-kernel PRIs in the kernel log, as this was done in BSD for quite some while. HOWEVER the config statement "$klogpermitnonkernelfacility on" must be used to permit this (otherwise non kernel messages are dropped). Sample of a such a message on a kernel without timestamping enabled: $ echo '<14>text' > /dev/kmsg $ dmesg -r <4><14>text NOTE: support for timestamp is NOT YET ENABLED!
* | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-9/+9
|/ / | | | | | | first step: adding object-type specifier to config statement table
* / removed no longer needed msg_t property "bParseHOSTNAME"Rainer Gerhards2009-10-131-1/+0
|/
* added $klogConsoleLogLevel directiveRainer Gerhards2009-07-031-1/+2
| | | | ...which permits to set a new console log level while rsyslog is active
* now put the new property-based methods to good useRainer Gerhards2009-07-011-4/+6
| | | | | | ... hopefully reducing the number of allocs/frees as well as overall memory usage in a busy system (plus that these shared properties hopefully remain in cache longer than its single-instance counterparts...)
* RcvFromIP now also a propertyRainer Gerhards2009-07-011-1/+1
| | | | | | This sets stage to enable use of the property-interface to speed up things (mildly), the next step to be done. I have also fixed one regression of yesterday's changes.
* introduced a new way of handling the RcvFrom propertyRainer Gerhards2009-06-301-1/+1
| | | | | | | | | | | ... plus a fix for a long-time bug in obj-types.h. That lead to the object pointer only then to become NULL when the object was actually destructed, I discovered this issue during introduction of the pRcvFrom property in msg_t, but it potentially had other effects, too. I am not sure if some experienced instability resulted from this bug OR if its fix will cause harm to so-far "correctly" running code. The later may very well be. Thus I will change it only for the current branch and also the beta, but not in all old builds. Let's see how things evolve.
* finished transition to using inputName propertyRainer Gerhards2009-06-301-2/+17
| | | | | ... plus some celanup and adding minor missing functionality (the rule debug info again tell the property name, not just number).
* introduced the idea of detached propertiesRainer Gerhards2009-06-291-1/+1
| | | | | | | | | | | | | some things inside the message can be used over a large number of messages and need to to be allocated and re-written every time. I now begin to implement this as a "prop_t" object, first use for the inputName. Some input modules are already converted, some others to go. Will do a little performance check on the new method before I go further. Also, this commit has some cleanup and a few bug fixes that prevented compiliation in debug mode (I overlooked this as I did not compile for debug, what I normally do, and the automatted test also does not do that)
* add support for KLogPathMichael Terry2009-06-291-0/+9
|
* optimized hostname processingRainer Gerhards2009-06-231-1/+1
|
* optimized handling of MSG part in msg objectRainer Gerhards2009-06-181-1/+1
| | | | | WARNING: currently, message repeation processing is disabled, must be reenabled (but prefer to do some other tests first)
* optimized TAG handling in msg objectRainer Gerhards2009-06-181-1/+1
|
* cleaned up/optimized raw message handling in msg objectRainer Gerhards2009-06-181-1/+1
|
* removed long-obsoleted property UxTradMsgRainer Gerhards2009-06-161-2/+0
| | | | | ... as well as some cleanup (some commented-out code is left to support UxTradMsg again is someone really complains ;)).
* some performance optimizationsRainer Gerhards2009-06-161-1/+1
| | | | | | - saved gettimeofday() calls in imtcp (and increased reception buffer) - somewhat optimized stringbuf.c - some other optimizations
* added capability to run multiple tcp listeners (on different ports)Rainer Gerhards2009-05-221-3/+4
| | | | | | | | | | | Well, actually this and a lot of related things. I improved the testbench so that the new capabilities are automatically tested and also did some general cleanup. The current multiple tcp listener solution will probably receive some further cleanup, too, but looks quite OK so far. I also reviewed the way tcpsrv et all work, in preparation of using this code for imdiag. I need to document the findings, especially as the code is rather complicated "thanks" to the combination of plain tcp and gssapi transport modes.
* bugfix: imklog did not compile on freeBSDRainer Gerhards2008-11-241-0/+11
|
* consolidated time calls during msg object creationRainer Gerhards2008-10-021-1/+0
| | | | | | ...this improves performance and consistency and also fixes a bug where subsecond time properties generated by imfile, imklog and internal messages could be slightly inconsistent.
* added properties "inputname" and "$myhostname"Rainer Gerhards2008-09-101-0/+2
| | | | | | | | - added message property "inputname", which contains the name of the input (module) that generated it. Presence is depending on suport in each input module (else it is blank). - added system property "$myhostname", which contains the name of the local host as it knows itself.
* Merge branch 'v3-stable' into betaRainer Gerhards2008-07-181-0/+1
|\ | | | | | | | | | | | | Conflicts: doc/property_replacer.html tools/syslogd.c
| * bugfix: remove PRI part from kernel message if it is presentRainer Gerhards2008-07-181-0/+1
| |
* | Merge branch 'beta'Rainer Gerhards2008-06-121-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imklog/linux.c
| * changed default for i$KlogSymbolLookup to "off"Rainer Gerhards2008-06-121-2/+2
| |
* | Merge branch 'beta'Rainer Gerhards2008-05-211-1/+1
|\| | | | | | | | | | | Conflicts: ChangeLog
| * bugfix: imklog went into an endless loop if a PRI value was insideRainer Gerhards2008-05-211-1/+1
| | | | | | | | | | | | a kernel log message This is an unusual case under Linux, and a frequent one under BSD
* | added fromhost-ip properties and some bugfixesRainer Gerhards2008-05-161-0/+2
| | | | | | | | | | | | | | | | | | | | - bugfix: TCP input modules did incorrectly set fromhost property (always blank) - bugfix: imklog did not set fromhost property - added "fromhost-ip" property - added "RSYSLOG_DebugFormat" canned template - bugfix: hostname and fromhost were swapped when a persisted message (in queued mode) was read in
* | moved host/domain-name related variables to global data poolRainer Gerhards2008-04-171-1/+5
| |