CSEC_PUBLIC/securityonion
1
0 Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-10-23 22:53:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Conflicts

Browse Source
This commit is contained in:
Mike Reeves committed 2020-06-11 13:14:11 -04:00
2 parents 9bed02934b 1c86ae4e14
commit 032c8ca4e9
32 files changed
+356 -1589
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pillar/logstash/master.sls
+1
View File
@@ -2,5 +2,6 @@ logstash:
pipelines:
master:
config:
- so/0009_input_beats.conf
- so/0010_input_hhbeats.conf
- so/9999_output_redis.conf.jinja
pillar/logstash/search.sls
-1
View File
@@ -12,6 +12,5 @@ logstash:
- so/9600_output_ossec.conf.jinja
- so/9700_output_strelka.conf.jinja
templates:
- so/so-beats-template.json
- so/so-common-template.json
- so/so-zeek-template.json