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

merge with dev and resolve conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-04-02 15:24:23 -04:00
parent ec60b7a2d4 1cac115009
commit 290abaf1d7
26 changed files with 123 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/logstash/search.sls
View File

@@ -2,7 +2,7 @@ logstash:
pipelines:
search:
config:
- so/0900_input_redis.conf.jinja
- so/0900_input_redis.conf.jinja
- so/9000_output_zeek.conf.jinja
- so/9002_output_import.conf.jinja
- so/9100_output_osquery.conf.jinja

6
pillar/top.sls
View File

@@ -21,7 +21,7 @@ base:
- static
- firewall.*
- data.*
- auth #Shared secrets
- secrets
- minions.{{ grains.id }}
'*_master':
@@ -33,7 +33,7 @@ base:
- firewall.*
- data.*
- brologs
- auth #Shared secrets
- secrets
- logstash
- logstash.eval
- healthcheck.eval
@@ -63,5 +63,5 @@ base:
- static
- firewall.*
- data.*
- auth #Shared secrets
- secrets
- minions.{{ grains.id }}