Victor Julien
cd7a5ff0ca
output: cleanups
...
Preparation of making output type for json logs configurable.
11 years ago
Victor Julien
efd4c42c0a
json tls log: rename to output-json-tls
11 years ago
Victor Julien
9950427466
output: check for multiple instances of drop and tls
...
Both the drop and tls logs are currently not designed to have multiple
instances running. So until that is changed, error out if more than one
instance is started.
11 years ago
Victor Julien
870bb23ff6
json drop log: rename to output-json-drop
11 years ago
Victor Julien
6cecb4e4d2
json dns: rename output-dnslog -> output-json-dns
11 years ago
Victor Julien
5874f52ec6
json: rename output-httplog -> output-json-http
11 years ago
Victor Julien
b5ef269b03
json outputs: cleanups
...
Clean up header files and improve memory handling.
11 years ago
Victor Julien
3fc63d3656
jansson file log: make file log module
...
Turn the libjansson based file logger into a file module, as a child
of eve-log.
11 years ago
Victor Julien
039f7b3e5f
tls json: turn into packet logger
...
Like log-tls, turn the json tls logger into a packet logger as the
protocol parser is not tx aware.
Make it a child of eve-log as well.
11 years ago
Victor Julien
a9eab06593
output: simple name space support for sub modules
...
To avoid module name clashes, a submode abc of parent xyz, will now
register itself as xyz.abc.
11 years ago
Victor Julien
3a794f7a63
drop-json: make child of eve-log
...
Make drop json child of eve-log.
11 years ago
Victor Julien
f0aa2ed240
json drop log: move into packet module
...
Move JSON drop log into a full packet module.
11 years ago
Victor Julien
4bd37cc46a
log api: use AppProto instead of uint16_t
11 years ago
Victor Julien
52c3d3ad7c
log api: convert all names to const
...
Instead of strdupping all names w/o a need, use const ptrs.
11 years ago
Victor Julien
85335d9cbe
alert json: make child of eve-log
...
Enable alert json for eve-log by registering the module as a sub-
module of eve-log.
11 years ago
Victor Julien
42858647e2
alert-json: make full module out of json alert
...
Make a full module out of the json alert code in output-json-alert.[ch].
11 years ago
Victor Julien
79771ff570
output: sub-module support for other log api's
...
Packets:
void OutputRegisterPacketSubModule(const char *parent_name, char *name, char *conf_name,
OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *),
PacketLogger LogFunc, PacketLogCondition ConditionFunc);
Files:
void OutputRegisterFileSubModule(const char *parent_name, char *name, char *conf_name,
OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *), FileLogger FileLogFunc);
Filedata:
void OutputRegisterFiledataSubModule(const char *parent_name, char *name, char *conf_name,
OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *), FiledataLogger FiledataLogFunc);
11 years ago
Victor Julien
f830cb8026
output: introduce concept of sub-modules
...
To support the 'eve-log' idea, we need to be able to force all log
modules to be enabled by the master eve-log module, and need to be
able to make all logs go into a single file. This didn't fit the
API so far, so added the sub-module concept.
A sub-module is a regular module, that registers itself as a sub-
module of another module:
OutputRegisterTxSubModule("eve-log", "JsonHttpLog", "http",
OutputHttpLogInitSub, ALPROTO_HTTP, JsonHttpLogger);
The first argument is the name of the parent. The 4th argument is
the OutputCtx init function. It differs slightly from the non-sub
one. The different is that in addition to it's ConfNode, it gets
the OutputCtx from the parent. This way it can set the parents
LogFileCtx in it's own OutputCtx.
The runmode setup code will take care of all the extra setup. It's
possible to register a module both as a normal module and as a sub-
module, which can operate at the same time.
Only the TxLogger API is handled in this patch, the rest will be
updated later.
11 years ago
Victor Julien
8c3e71559a
dns-json: turn logger to tx api
...
Convert Json DNS logger into a Tx Logger API logger.
11 years ago
Victor Julien
bc71a43e08
http-json: separate module using tx api
...
Turn HTTP json logger into a Tx Logger API logger.
11 years ago
Victor Julien
4874d5abbb
Various compile fixes after rebase with master
11 years ago
Tom DeCanio
18458a14fb
json: rebase fixes
...
- restore json output-file.[ch] as output-json-file.[ch] after rebase conflict
- fix Makefile.am after merge conflict
- some dev-log-api-v4.0 rebase json fallout cleanup
11 years ago
Tom DeCanio
6fd1b31c57
Remaining JSON output pull request comment edits
11 years ago
Tom DeCanio
a3d86594dc
address most initial JSON pull request comments
11 years ago
Tom DeCanio
55df2d5cdb
add "united" drop JSON log
11 years ago
Tom DeCanio
0c067646a8
Add "united" JSON files output
11 years ago
Tom DeCanio
730ee3d721
First cut at "united" file log output in JSON
11 years ago
Tom DeCanio
88a04742c0
JSON output cleanup
11 years ago
Tom DeCanio
b4ac0d90a4
remove unused http JSON code
11 years ago
Tom DeCanio
a12fa7c4e1
more output JSON cleanup
11 years ago
Tom DeCanio
6974817f72
remove dead JSON DNS output code
11 years ago
Tom DeCanio
a44b2b987b
JSON output cleanup
11 years ago
Tom DeCanio
3241732e27
rename alert-json.[ch] output-json.[ch]
11 years ago
Tom DeCanio
3bc95c9258
fix compile errors w/o libjansson
11 years ago
Tom DeCanio
8adbc741ba
remove unused JSON TMM_*JSON enumerations
11 years ago
Tom DeCanio
07d3b38d3b
Add support for JSON output to syslog/unix_stream/unix_dgram
11 years ago
Tom DeCanio
1dd6d7a104
Add "united" log to suricata.yaml.in
11 years ago
Tom DeCanio
6c1de2115c
JSON output cleanup
11 years ago
Tom DeCanio
c654b63f6a
add united TLS JSON logging
11 years ago
Tom DeCanio
51b7cf1491
add ICMP type and code support to JSON log
11 years ago
Tom DeCanio
c8beb9bf9d
Support for configuration of JSON http output module
11 years ago
Tom DeCanio
8c95b085c5
Add vlan and pcap_cnt to JSON logs
11 years ago
Tom DeCanio
ce6b07b1b9
First cut at united .yaml configuration
11 years ago
Tom DeCanio
11f84d4ff7
beginning of JSON config alignment
11 years ago
Tom DeCanio
280e4bcb61
move some JSON alert work outside of lock
11 years ago
Tom DeCanio
34d04c3104
JSON cleanup
11 years ago
Tom DeCanio
0df6af3a0b
Alert/HTTP/DNS JSON output working with Logstash
11 years ago
Tom DeCanio
5543b6eef4
nested json alert output
11 years ago
Tom DeCanio
b94b8e03bd
cleanup fallout from upstream merge with alert json work
11 years ago
Tom DeCanio
07571367d3
Change JSON alert syslog level to INFO
11 years ago