summaryrefslogtreecommitdiffstats
path: root/plugins/imklog
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: imklog issued wrong facility in error messagesRainer Gerhards2013-01-151-1/+1
| | | | ...what could lead to problems in other parts of the code
* Merge branch 'v7-stable'Rainer Gerhards2012-11-223-17/+37
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h
| * imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | | | | | | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge).
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-223-25/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h
| | * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-221-12/+12
| | | | | | | | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea.
| | * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-213-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time.
| | * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-213-2/+8
| | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too.
| * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-3/+5
| |\ \
* | | | imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-191-5/+3
| | | |
* | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-173-13/+18
| | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on.
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | |
| | * imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | |
| | * imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | |
| | * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-23/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| | * \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-1/+26
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| | * \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-012-31/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
| | * | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | | | | | imklog: removal of no longer needed config directivesRainer Gerhards2012-06-292-37/+6
| | | | | |
* | | | | | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-291-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
| | | | | |
* | | | | | imklog: support for module() global config parameters addedRainer Gerhards2012-06-292-58/+116
|/ / / / /
* | | | | 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-272-31/+29
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-272-31/+29
| |\ \
| | * | licensing changeRainer Gerhards2012-01-212-31/+29
| | | |
| | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-3/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | * \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-191-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
* | | \ \ \ Merge branch 'v5-devel' & fix bug in BSD imklog driverRainer Gerhards2012-01-238-2105/+176
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c
| * | | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
| | | | | |
| * | | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-237-2063/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-301-3/+0
| | | | | |
* | | | | | 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.
* | | | | | | somewhat more informative imklog status messages (mostly cosmetic)Rainer Gerhards2011-08-051-2/+4
| | | | | | |
* | | | | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-275-97/+117
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-99/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-111/+188
| | | | | | |
* | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 22:23:30 +0000