aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log: Remove standalone output registration

Browse Source 
Remove standalone output logger registration since eve is
multi-instance.
pull/5356/head
Jeff Lucovsky 5 years ago committed by Victor Julien
parent b21160a6e3
commit 15caf3eea5
11 changed files with 8 additions and 69 deletions
Show Stats Download Patch File Download Diff File

3
src/output-json-alert.c
Unescape Escape View File

@ -1076,9 +1076,6 @@ error:
void JsonAlertLogRegister (void)
{
OutputRegisterPacketModule(LOGGER_JSON_ALERT, MODULE_NAME, "alert-json-log",
JsonAlertLogInitCtx, JsonAlertLogger, JsonAlertLogCondition,
JsonAlertLogThreadInit, JsonAlertLogThreadDeinit, NULL);
OutputRegisterPacketSubModule(LOGGER_JSON_ALERT, "eve-log", MODULE_NAME,
"eve-log.alert", JsonAlertLogInitCtxSub, JsonAlertLogger,
JsonAlertLogCondition, JsonAlertLogThreadInit, JsonAlertLogThreadDeinit,

10
src/output-json-dns.c
Unescape Escape View File

@ -712,16 +712,6 @@ static OutputInitResult JsonDnsLogInitCtx(ConfNode *conf)
#define MODULE_NAME "JsonDnsLog"
void JsonDnsLogRegister (void)
{
/* Logger for requests. */
OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS_TS, MODULE_NAME,
"dns-json-log", JsonDnsLogInitCtx, ALPROTO_DNS, JsonDnsLoggerToServer,
0, 1, LogDnsLogThreadInit, LogDnsLogThreadDeinit, NULL);
/* Logger for replies. */
OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS_TC, MODULE_NAME,
"dns-json-log", JsonDnsLogInitCtx, ALPROTO_DNS, JsonDnsLoggerToClient,
1, 1, LogDnsLogThreadInit, LogDnsLogThreadDeinit, NULL);
/* Sub-logger for requests. */
OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_DNS_TS, "eve-log",
MODULE_NAME, "eve-log.dns", JsonDnsLogInitCtxSub, ALPROTO_DNS,

3
src/output-json-drop.c
Unescape Escape View File

@ -445,9 +445,6 @@ static int JsonDropLogCondition(ThreadVars *tv, const Packet *p)
void JsonDropLogRegister (void)
{
OutputRegisterPacketModule(LOGGER_JSON_DROP, MODULE_NAME, "drop-json-log",
JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition,
JsonDropLogThreadInit, JsonDropLogThreadDeinit, NULL);
OutputRegisterPacketSubModule(LOGGER_JSON_DROP, "eve-log", MODULE_NAME,
"eve-log.drop", JsonDropLogInitCtxSub, JsonDropLogger,
JsonDropLogCondition, JsonDropLogThreadInit, JsonDropLogThreadDeinit,

7
src/output-json-flow.c
Unescape Escape View File

@ -479,12 +479,7 @@ static TmEcode JsonFlowLogThreadDeinit(ThreadVars *t, void *data)
void JsonFlowLogRegister (void)
{
/* register as separate module */
OutputRegisterFlowModule(LOGGER_JSON_FLOW, "JsonFlowLog", "flow-json-log",
OutputFlowLogInit, JsonFlowLogger, JsonFlowLogThreadInit,
JsonFlowLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterFlowSubModule(LOGGER_JSON_FLOW, "eve-log", "JsonFlowLog",
"eve-log.flow", OutputFlowLogInitSub, JsonFlowLogger,
JsonFlowLogThreadInit, JsonFlowLogThreadDeinit, NULL);

7
src/output-json-http.c
Unescape Escape View File

@ -793,12 +793,7 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data)
void JsonHttpLogRegister (void)
{
/* register as separate module */
OutputRegisterTxModule(LOGGER_JSON_HTTP, "JsonHttpLog", "http-json-log",
OutputHttpLogInit, ALPROTO_HTTP, JsonHttpLogger, JsonHttpLogThreadInit,
JsonHttpLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterTxSubModule(LOGGER_JSON_HTTP, "eve-log", "JsonHttpLog",
"eve-log.http", OutputHttpLogInitSub, ALPROTO_HTTP, JsonHttpLogger,
JsonHttpLogThreadInit, JsonHttpLogThreadDeinit, NULL);

8
src/output-json-metadata.c
Unescape Escape View File

@ -270,20 +270,12 @@ error:
void JsonMetadataLogRegister (void)
{
OutputRegisterPacketModule(LOGGER_JSON_METADATA, MODULE_NAME,
"metadata-json-log", JsonMetadataLogInitCtx, JsonMetadataLogger,
JsonMetadataLogCondition, JsonMetadataLogThreadInit,
JsonMetadataLogThreadDeinit, NULL);
OutputRegisterPacketSubModule(LOGGER_JSON_METADATA, "eve-log", MODULE_NAME,
"eve-log.metadata", JsonMetadataLogInitCtxSub, JsonMetadataLogger,
JsonMetadataLogCondition, JsonMetadataLogThreadInit,
JsonMetadataLogThreadDeinit, NULL);
/* Kept for compatibility. */
OutputRegisterPacketModule(LOGGER_JSON_METADATA, MODULE_NAME,
"vars-json-log", JsonMetadataLogInitCtx, JsonMetadataLogger,
JsonMetadataLogCondition, JsonMetadataLogThreadInit,
JsonMetadataLogThreadDeinit, NULL);
OutputRegisterPacketSubModule(LOGGER_JSON_METADATA, "eve-log", MODULE_NAME,
"eve-log.vars", JsonMetadataLogInitCtxSub, JsonMetadataLogger,
JsonMetadataLogCondition, JsonMetadataLogThreadInit,

7
src/output-json-netflow.c
Unescape Escape View File

@ -437,12 +437,7 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data)
void JsonNetFlowLogRegister(void)
{
/* register as separate module */
OutputRegisterFlowModule(LOGGER_JSON_NETFLOW, "JsonNetFlowLog",
"netflow-json-log", OutputNetFlowLogInit, JsonNetFlowLogger,
JsonNetFlowLogThreadInit, JsonNetFlowLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterFlowSubModule(LOGGER_JSON_NETFLOW, "eve-log", "JsonNetFlowLog",
"eve-log.netflow", OutputNetFlowLogInitSub, JsonNetFlowLogger,
JsonNetFlowLogThreadInit, JsonNetFlowLogThreadDeinit, NULL);

7
src/output-json-smtp.c
Unescape Escape View File

@ -254,12 +254,7 @@ static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data)
}
void JsonSmtpLogRegister (void) {
/* register as separate module */
OutputRegisterTxModule(LOGGER_JSON_SMTP, "JsonSmtpLog", "smtp-json-log",
OutputSmtpLogInit, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit,
JsonSmtpLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterTxSubModule(LOGGER_JSON_SMTP, "eve-log", "JsonSmtpLog",
"eve-log.smtp", OutputSmtpLogInitSub, ALPROTO_SMTP, JsonSmtpLogger,
JsonSmtpLogThreadInit, JsonSmtpLogThreadDeinit, NULL);

8
src/output-json-ssh.c
Unescape Escape View File

@ -233,13 +233,7 @@ static OutputInitResult OutputSshLogInitSub(ConfNode *conf, OutputCtx *parent_ct
void JsonSshLogRegister (void)
{
/* register as separate module */
OutputRegisterTxModuleWithCondition(LOGGER_JSON_SSH,
"JsonSshLog", "ssh-json-log",
OutputSshLogInit, ALPROTO_SSH, JsonSshLogger,
SSHTxLogCondition, JsonSshLogThreadInit, JsonSshLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterTxSubModuleWithCondition(LOGGER_JSON_SSH,
"eve-log", "JsonSshLog", "eve-log.ssh",
OutputSshLogInitSub, ALPROTO_SSH, JsonSshLogger,

7
src/output-json-stats.c
Unescape Escape View File

@ -534,12 +534,7 @@ static OutputInitResult OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_
}
void JsonStatsLogRegister(void) {
/* register as separate module */
OutputRegisterStatsModule(LOGGER_JSON_STATS, MODULE_NAME, "stats-json",
OutputStatsLogInit, JsonStatsLogger, JsonStatsLogThreadInit,
JsonStatsLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterStatsSubModule(LOGGER_JSON_STATS, "eve-log", MODULE_NAME,
"eve-log.stats", OutputStatsLogInitSub, JsonStatsLogger,
JsonStatsLogThreadInit, JsonStatsLogThreadDeinit, NULL);

10
src/output-json-tls.c
Unescape Escape View File

@ -649,15 +649,9 @@ static OutputInitResult OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ct
void JsonTlsLogRegister (void)
{
/* register as separate module */
OutputRegisterTxModuleWithProgress(LOGGER_JSON_TLS, "JsonTlsLog",
"tls-json-log", OutputTlsLogInit, ALPROTO_TLS, JsonTlsLogger,
TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, JsonTlsLogThreadInit,
JsonTlsLogThreadDeinit, NULL);
/* also register as child of eve-log */
/* register as child of eve-log */
OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TLS, "eve-log",
"JsonTlsLog", "eve-log.tls", OutputTlsLogInitSub, ALPROTO_TLS,
JsonTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE,
JsonTlsLogThreadInit, JsonTlsLogThreadDeinit, NULL);
}
}

Write Preview
Loading…
Cancel
Save