65 Commits

Author SHA1 Message Date
Rainer Gerhards
5e3b075d53 fix compiler warnings 2016-06-02 12:08:55 +02:00
Rainer Gerhards
170bf66556 refactor stats system: do use cstr only if needed
There are probably more areas that could be changed, but this is
a good self-sufficient change.

see also https://github.com/rsyslog/rsyslog/issues/1044
2016-05-19 11:28:00 +02:00
Rainer Gerhards
3549041b0f Merge branch 'dyn_stats' of https://github.com/janmejay/rsyslog into master-integrate-dynstats
Conflicts:
	.travis.yml
	grammar/rainerscript.c
	plugins/imdiag/imdiag.c
2016-01-28 09:51:25 +01:00
Rainer Gerhards
0f5595c074 impstats: support broken ElasticSearch JSON implementation
ES 2.0 no longer supports valid JSON and disallows dots inside names.
This adds a new "json-elasticsearch" format option which replaces
those dots by the bang ("!") character. So "discarded.full" becomes
"discarded!full".

This is a workaroud. A method that will provide more control over
replacemetns will be implemented some time in the future. For
details, see below-quoted issue tracker.

closes https://github.com/rsyslog/rsyslog/issues/713
2015-12-23 09:16:03 +01:00
Janmejay Singh
6da7aeb975 - dynstats basic-test first-cut
- vg-test caught a minor issue in impstats (fixed)
- placeholder created for other dynstats tests
- a new assertion in diag.sh which allows extracting a particular column and expecting sum-up to match given value
- imdiag supports injecting litteral messages now (test can send a fully formed syslog message through imdiag, its a backward compatible change in protocol, allows for richer things to be build while being fully backward compatible)
2015-11-13 17:45:07 +05:30
Brad Davis
a35779cc56 Fix missing headers that clang complains about 2014-12-11 13:03:22 +01:00
Rainer Gerhards
423c3ac62c pstats: add "origin" paramter to stats records
see also: https://github.com/rsyslog/rsyslog/issues/119
2014-11-19 15:49:09 +01:00
Rainer Gerhards
392d7f304a Merge branch 'v7-stable-bracketing' 2014-08-29 12:44:58 +02:00
Rainer Gerhards
8eccb3cbe0 impstats: add "bracketing" option 2014-08-29 12:44:06 +02:00
Rainer Gerhards
770fad169b Merge branch 'v7-devel' 2013-12-11 13:49:18 +01:00
Rainer Gerhards
923a90e8e9 impstats: output stats record on impstats (rsyslog) termination 2013-12-11 13:18:01 +01:00
Rainer Gerhards
2a1ad9d631 impstats: cleanup 2013-10-29 16:49:46 +01:00
Rainer Gerhards
8fd192bfa6 impstats: initial shot at multi-ruleset support 2013-10-19 11:48:04 +02:00
Rainer Gerhards
099968a1df remove compiler warning 2013-10-18 07:18:46 +02:00
Rainer Gerhards
490b083326 impstats: implement parameter "resetCounters"
it provides the capability to make impstats emit deltas in contrast to
accumulated counter values (see doc for details).
2013-09-09 15:41:07 +02:00
Rainer Gerhards
fbc737d650 experimental: make impstats return delta values where possible 2013-09-07 15:58:09 +02:00
5721c4dff6 update to newest version of stats scripts 2013-07-22 15:54:26 +02:00
e0da083bdd Started implementing statslog analyzer for impstats
This script will help finding unusual things in the impstats logs
2013-07-22 15:46:09 +02:00
a593ccddd4 Removed commandline arg count limit from scripts 2013-07-12 11:56:43 +02:00
fba8609b2a Added new option "chartscalcdelta" to generate charts with delta values instead of cumulative values.
Also fixed reading outputfile parameter in statslog-graph.py script.
2013-07-11 11:28:39 +02:00
53bd9a94ec Merge branch 'master' into v7-stats-scripts 2013-07-11 10:56:16 +02:00
Rainer Gerhards
02f28cd963 Merge branch 'c8'
Conflicts:
	ChangeLog
	plugins/impstats/impstats.c
2013-07-11 08:30:46 +02:00
Rainer Gerhards
330120d1ef impstats: add process resource usage counters [via getrusage()] 2013-07-11 08:28:07 +02:00
57fa85ee7f Added command line switch to generate bar charts in statslog-splitter.py 2013-07-05 15:48:17 +02:00
2953e6dc81 Fixed Datetime detection 2013-07-03 18:18:59 +02:00
ebe5266336 Added support for multiple regex commands, useful for parsing multiple rsyslog formats 2013-07-03 18:07:04 +02:00
036096c1b4 Added more command line options to customize the charts and their output 2013-07-03 16:50:18 +02:00
7b16f5c497 Finished statslog graph and splitter script.
Also added needed javascript files, so they can be included into the svg files.
This removes dependencies on external sources.

The statslog-splitter can now automatically generated SVG or PNG charts together
with an index.html in the output directory. This helps taking a quick view on all
generated stats data.
2013-07-03 13:21:46 +02:00
1d22bd58d4 Finsihed implementing chart gemerator script for impstats.
CSV Data generated by statslog-splitter is needed.
To run the chart script, the following packages need to be installed:
	- python pip
	- python cairosvg
With pip install these packages:
	- pip install CairoSVG tinycss cssselect pygal
2013-07-03 12:16:40 +02:00
fe88c0cd17 Started implementing stats chart generator 2013-07-02 17:05:39 +02:00
bc194a9b76 Added script to split impstats logfiles into processable csv files
Python 2.6 or higher is needed to run the script
2013-07-02 15:09:30 +02:00
Rainer Gerhards
5141493d32 impstats: solve build problem on FreeBSD
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458
2013-06-24 11:37:28 +02:00
Rainer Gerhards
f373968c66 Merge branch 'v7-stable-libnet-frag'
Conflicts:
	ChangeLog
	configure.ac
	tools/omfile.c
2013-01-11 09:39:27 +01:00
Rainer Gerhards
77737e8ab2 impstats: added ability to write stats records to local file
...and avoid going through the syslog log stream. syslog logging can now
also be turned off (see doc for details).
2013-01-10 16:37:59 +01:00
Rainer Gerhards
66dcd68d62 Merge branch 'v7-stable-libnet-frag'
Conflicts:
	configure.ac
	plugins/impstats/impstats.c
	plugins/omudpspoof/omudpspoof.c
	runtime/rsyslog.h
2012-12-18 12:01:52 +01:00
Rainer Gerhards
2ef0e994de add some better debug information to impstats 2012-12-18 09:07:39 +01:00
Rainer Gerhards
a7c5807346 imklog, impstats: support for new rate-limiting API added 2012-10-19 10:03:30 +02:00
Rainer Gerhards
2a6ff7d53d interface cleanup (probably not final) 2012-10-15 08:55:12 +02:00
Rainer Gerhards
4269e45781 new ratelimit: interface plumbing added
no actual implementation yet done
2012-10-09 18:54:25 +02:00
Rainer Gerhards
ac5a2673eb provide support to dynamically enable/disable legacy conf command
most important to prevent clashes with new style settings
2012-06-26 19:08:02 +02:00
Rainer Gerhards
71559ed4d8 imudp: support for module() global config parameters added 2012-06-26 18:33:41 +02:00
Rainer Gerhards
dd0572f2a5 impstats: support for module() global config parameters added 2012-06-26 17:19:23 +02:00
David Kelly
cbff73d94c added new-style zeromq plugins, based on czmq api and rsyslog v6 conf 2012-05-29 13:05:59 +02:00
Rainer Gerhards
d6da57ae03 Merge branch 'v5-stable-newstats'
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
2012-04-07 15:42:46 +02:00
Rainer Gerhards
5351538b0a impstats: added $PStatsJSON directive 2012-04-01 18:58:58 +02:00
Rainer Gerhards
49ec54d369 milestone: added capability to use a local interface IP address as fromhost-ip
... for locally originating messages. New directive $LocalHostIPIF.
Note that not all modules yet support this new directive - next step...
2012-03-21 11:43:45 +01: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