CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-01-03 06:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge with dev and resolve conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-07-10 16:27:10 -04:00
parent 9730c4561d 755f47da2d
commit 13af4cacb0
29 changed files with 205 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pillar/logstash/eval.sls
View File

@@ -19,6 +19,7 @@ logstash:
- so/so-beats-template.json.jinja
- so/so-common-template.json
- so/so-firewall-template.json.jinja
- so/so-flow-template.json.jinja
- so/so-ids-template.json.jinja
- so/so-import-template.json.jinja
- so/so-osquery-template.json.jinja

1
pillar/logstash/search.sls
View File

@@ -15,6 +15,7 @@ logstash:
- so/so-beats-template.json.jinja
- so/so-common-template.json
- so/so-firewall-template.json.jinja
- so/so-flow-template.json.jinja
- so/so-ids-template.json.jinja
- so/so-import-template.json.jinja
- so/so-osquery-template.json.jinja