Eric Leblond
d837562441
logging: fix modules ordering during logging
...
With the previous code the order of the logging modules in the
YAML were determining which module was run first. This was not
wished and a consequences was that the EVE fileinfo module was
not correctly displaying the key 'stored' because it was
depending on a flag set alter by the filestore module.
This patch adds a priority file to the TmModule structure. The
higher the priority is set, the sooner the module is run in the
logging process. The RunModeOutput structure has also been
updated to contain the name of the original TmModule. Thus allowing
to define a priority for a RunModeOutput.
Currently only the filestore has a priority set. The rest of them is
set to the default value of zero.
11 years ago
Eric Leblond
be07620a60
output-lua: sync variable name with yaml
...
'script-dir' was used in the code but we had 'scripts-dir' in the
configuration file. This patch fixes it to 'scripts-dir'.
11 years ago
Jason Ish
ae23144b67
--set - handle spaces on either side of '='
...
Discard spaces when provided as part of --set around the '='. For
example, "val=key", "val = key", "val= key" and "val =key" are
all equivalent now.
11 years ago
Jason Ish
d9fe95bc8a
conf - function declaration style
...
Use consistent style - function return type and declaration on
same line.
11 years ago
DIALLO David
0a4fd39f9c
modbus: fix heap-buffer-overflow in Modbus parser
...
Modbus parser does not check length to extract/read data (read or write address,
quantity of data, etc.) that should be present.
In case of malformated data (invalid length in header), Modbus parser reads data
over the input data length.
Add check before extracting/reading data from input buffer to avoid head buffer
overflow.
11 years ago
Victor Julien
07efec550d
counters: use ptr to name instead of copy
...
All counters have hardcoded names, so copies are not needed.
11 years ago
Victor Julien
7e66c70507
counters: don't run if no counters have been registered
11 years ago
Victor Julien
cb5aa8f8d5
counters: work around unix-socket init issues
11 years ago
Victor Julien
e48153c6b0
counters: make threads cleanup all memory
11 years ago
Victor Julien
81548ae3e8
counters: clean up global context
11 years ago
Victor Julien
84b8829cb4
counters: turn flow.memuse into a global counter
11 years ago
Victor Julien
0a262acdfb
counters: make DNS counters globals
11 years ago
Victor Julien
ac069c579a
counters: make tcp.memuse a global counter
11 years ago
Victor Julien
cddbb0f606
http: make http.memuse a global counter
...
http.memcap as well.
11 years ago
Victor Julien
f05d0692ef
counters: remove references to 'perf' counters
11 years ago
Victor Julien
faef92f8da
counters: remove last and now unused tm_name reference
11 years ago
Victor Julien
83f27ae2a5
counters: remove old unix socket json logic
11 years ago
Victor Julien
41ead6611a
counters: minor internal API cleanups
11 years ago
Victor Julien
d2a9ef2680
counters: rename unparsable SCPCAElem to StatsLocalCounter
11 years ago
Victor Julien
4c3ccda72e
counters: minor header cleanup
11 years ago
Victor Julien
752f03e7a4
counters: remaining s/SCPerf/Stats/g
11 years ago
Victor Julien
4362d0a6e9
counters: s/SCPerfPrivateContext/StatsPrivateThreadContext/g
11 years ago
Victor Julien
628c3b1bc7
counters: s/SCPerfPublicContext/StatsPublicThreadContext/g
11 years ago
Victor Julien
7e70f136ec
counters: various renames and cleanups
11 years ago
Victor Julien
30cce2bd29
counters: s/SCPerfCounterSetUI64/StatsSetUI64/g
11 years ago
Victor Julien
1c0b4ee0ae
counters: s/SCPerfCounterIncr/StatsIncr/g
11 years ago
Victor Julien
8992275b0c
counters: s/SCPerfCounterAddUI64/StatsAddUI64/g
11 years ago
Victor Julien
60d9eb6790
counters: clean up defines
11 years ago
Victor Julien
1ef786e7cb
counters: rename register API calls
...
Also remove 'type' parameter which was always the same.
11 years ago
Victor Julien
3fab736539
log-stats: make global/threads logging configurable
11 years ago
Victor Julien
2c9a2c8327
stats: support per thread stats in json output
...
Default is only to output totals. Optionally per thread can be added.
Both can be enabled together.
11 years ago
Victor Julien
175831331c
stats json: replace strndup
...
strndup is a banned function.
11 years ago
Victor Julien
6565c86f96
stats-json: fixes and improvements
...
Use proper LogFileCtx and MemBuffer handling so we can have multiple
loggers active at the same time.
Change 'date' field to timestamp, and use ISO notation to make it
the same as the other JSON outputs.
11 years ago
Tom DeCanio
e4e07d0c3b
eve-log: stats logging code cleanup.
11 years ago
Tom DeCanio
117eed0385
eve-log: add JSON stats logging
...
Support for counters in stats.log in eve output JSON stream.
11 years ago
Victor Julien
23f17950bc
counters: pass per thread stats to output api
...
As well as the global (merged) stats.
11 years ago
Victor Julien
de82b6d31e
counters: rename widely used pctmi var to sts (stats thread store)
11 years ago
Victor Julien
60c5ad4649
counters: call global counters funcs
11 years ago
Victor Julien
33756abd87
counters: split API init
...
Split into early ctx initialization and post-config setup.
11 years ago
Victor Julien
d05eed3735
counters: start using Stats prefix
11 years ago
Victor Julien
f300ad253e
counters: simplify and speedup counters sync
11 years ago
Victor Julien
0478407833
counters: remove threadvars arg from SCPerfAddToClubbedTMTable
11 years ago
Victor Julien
2346a88db7
counters: remove thread module name from counters API
11 years ago
Victor Julien
b5bd3dee13
stream: make tcp.reassembly_memuse counter global
...
Fixes bugs #632 and #1178
11 years ago
Victor Julien
06461e37da
counters: global counters registration
11 years ago
Victor Julien
9bbef55c4d
Fix harmless typo in IPOnlyCIDRItemNew's SCReturnPtr use
11 years ago
Victor Julien
b293a4b7d0
counters: remove unused description
11 years ago
Victor Julien
711cd7b59b
counters: merge counters from threads for output
...
Merge counters so the table contains combined values from counters
from each thread.
Use global counter id's, track them in a hash.
Rename SCPCAElem members
Fix and improve average counters
11 years ago
Victor Julien
7da657dc3d
counters: remove unused public API calls and make them private
11 years ago
Victor Julien
ac6e24c06a
counters: make SCPerfSetupPrivate a function
11 years ago