Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev

This commit is contained in:
William Wernert
2020-07-07 13:12:50 -04:00
3 changed files with 3 additions and 2 deletions

View File

@@ -6,6 +6,7 @@
{ "rename": { "field": "message2.scan", "target_field": "scan", "ignore_missing": true } }, { "rename": { "field": "message2.scan", "target_field": "scan", "ignore_missing": true } },
{ "rename": { "field": "message2.request", "target_field": "request", "ignore_missing": true } }, { "rename": { "field": "message2.request", "target_field": "request", "ignore_missing": true } },
{ "rename": { "field": "scan.hash", "target_field": "hash", "ignore_missing": true } }, { "rename": { "field": "scan.hash", "target_field": "hash", "ignore_missing": true } },
{ "grok": { "field": "request.attributes.filename", "patterns": ["-%{WORD:log.id.fuid}-"] } },
{ "remove": { "field": ["host", "path"], "ignore_missing": true } }, { "remove": { "field": ["host", "path"], "ignore_missing": true } },
{ "pipeline": { "name": "common" } } { "pipeline": { "name": "common" } }
] ]

View File

@@ -8,7 +8,7 @@ output {
key => 'logstash:unparsed' key => 'logstash:unparsed'
congestion_interval => 1 congestion_interval => 1
congestion_threshold => 50000000 congestion_threshold => 50000000
batch ==> True batch => True
batch_events => {{ BATCH }} batch_events => {{ BATCH }}
} }
} }

View File

@@ -623,7 +623,7 @@ fi
if [[ $success != 0 || -z $SO_ERROR ]]; then whiptail_setup_failed if [[ $success != 0 || -z $SO_ERROR ]]; then whiptail_setup_failed
else else
whiptail_setup_complete whiptail_setup_complete
if [[ $THEHIVE == 1 ]]; then check_hive_init; fi if [[ $THEHIVE == 1 ]]; then check_hive_init; fi
fi fi
install_cleanup >> $setup_log 2>&1 install_cleanup >> $setup_log 2>&1