rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 17:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,541 Commits 67 Branches 505 Tags
Commit Graph

20 Commits

Author SHA1 Message Date
Rainer Gerhards
5351538b0a impstats: added $PStatsJSON directive 2012-04-01 18:58:58 +02:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master 
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
 2012-01-19 13:07:46 +01:00
Rainer Gerhards
b38dd53e08 undoing v6.1 config scoping interface, part II (now finished) 
This concludes the removal of the new scoping interface, at least as
far as pre v6-plugins are affected. Full code cleanup will happen
in the v6.3 branch.
 2012-01-19 12:33:12 +01:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master 
Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c
 2012-01-18 14:08:24 +01:00
Rainer Gerhards
fe4cfa6d1f Merge branch 'v5-stable' into v6-stable 
Conflicts:
	plugins/imtcp/imtcp.c
 2012-01-14 18:35:09 +01:00
Rainer Gerhards
a357646ca1 relicense to ASL 2.0 2012-01-11 18:52:53 +01:00
Rainer Gerhards
00d2ac3d71 Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
 2011-12-19 17:30:43 +01:00
Rainer Gerhards
7796eeb696 new stats counter "discarded" for queue object 
Tells how many messages have been discarded due to queue full condition.
 2011-12-16 14:42:37 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
3e8ee7a6d2 move impstats to new config interface 2011-05-20 10:55:11 +02:00
Rainer Gerhards
c0d1334f6e step: imtcp moved to new config interface 
as far as we know that new interface right now ;)
 2011-05-05 11:36:05 +02:00
Rainer Gerhards
d0d9f823b7 step: put plumbing in place for new input module config system 2011-05-03 18:02:18 +02:00
Rainer Gerhards
90ef0f7a0b Merge branch 'v5-devel' 
Conflicts:
	plugins/impstats/impstats.c
 2011-04-15 14:51:29 +02:00
Rainer Gerhards
27866eddb9 bugfix: doc for impstats had wrong config statements 
also, config statements were named a bit inconsistent, resolved that
problem by introducing an alias and only documenting the consistent
statements
Thanks to Marcin for bringing up this problem.
 2011-04-14 12:30:45 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta' 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
 2011-03-11 10:24:58 +01:00
Rainer Gerhards
68124ef1f6 fixed small regression from gnutls fd leak fix 2011-03-06 15:18:01 +01:00
Rainer Gerhards
c7e9e2123e Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
	runtime/rsyslog.h
 2010-10-05 16:10:27 +02:00
Rainer Gerhards
e86cb62f12 improved statistics-gathering subsystem 
... well, actually this is a first real implementation of this subsystem.
I have added a counter registry, a way to access the countres (as readable
string) and a way to define and maintem them. Also, module impstats has
been updated to utilize the new system. Finally, I added some counters. I
hope that this sets the baseline for useful future enhancements.
 2010-09-13 15:43:56 +02:00
Rainer Gerhards
3d50fd6a67 fixed small memory leak, corrected input name 2010-09-09 12:37:11 +02:00
Rainer Gerhards
3cbd7300c4 added module impstat to emit periodic statistics on rsyslog counters 
This is a *very first* and *very rough* and *very featureless* first
shot at this functionality. It is assumed that we will enhance the
stats system as a by-line while doing other development.
 2010-09-09 12:24:22 +02:00