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

Merge remote-tracking branch 'remotes/origin/dev' into issue/1049

Browse Source
This commit is contained in:
m0duspwnens
2020-08-10 16:36:49 -04:00
parent 30e0abf326 6bb84f8513
commit 11433b87e6
21 changed files with 853 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/firewall/ports.sls
View File

@@ -33,6 +33,8 @@ firewall:
- 9300
- 9400
- 9500
- 9595
- 9696
udp:
- 1514
minions:

7
pillar/logstash/manager.sls
View File

@@ -1,12 +1,9 @@
{%- set PIPELINE = salt['pillar.get']('global:pipeline', 'minio') %}
{%- set PIPELINE = salt['pillar.get']('global:pipeline', 'redis') %}
logstash:
pipelines:
manager:
config:
- so/0009_input_beats.conf
- so/0010_input_hhbeats.conf
{%- if PIPELINE == "minio"%}
- so/9998_output_minio.conf.jinja
{%- else %}
- so/9999_output_redis.conf.jinja
{%- endif %}

4
pillar/logstash/search.sls
View File

@@ -3,11 +3,7 @@ logstash:
pipelines:
search:
config:
{%- if PIPELINE == "minio"%}
- so/0899_input_minio.conf.jinja
{%- else %}
- so/0900_input_redis.conf.jinja
{%- endif %}
- so/9000_output_zeek.conf.jinja
- so/9002_output_import.conf.jinja
- so/9034_output_syslog.conf.jinja