mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
Add back bind mounts and remove THIRDPARTY
This commit is contained in:
@@ -18,7 +18,7 @@
|
|||||||
{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
|
{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
|
||||||
{% set LOCALHOSTNAME = salt['grains.get']('host') %}
|
{% set LOCALHOSTNAME = salt['grains.get']('host') %}
|
||||||
{% set MANAGER = salt['grains.get']('master') %}
|
{% set MANAGER = salt['grains.get']('master') %}
|
||||||
{% from 'filebeat/modules.map.jinja' import THIRDPARTY with context %}
|
{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %}
|
||||||
{% from 'filebeat/modules.map.jinja' import MODULESENABLED with context %}
|
{% from 'filebeat/modules.map.jinja' import MODULESENABLED with context %}
|
||||||
{% from 'filebeat/map.jinja' import FILEBEAT_EXTRA_HOSTS with context %}
|
{% from 'filebeat/map.jinja' import FILEBEAT_EXTRA_HOSTS with context %}
|
||||||
{% set ES_INCLUDED_NODES = ['so-eval', 'so-standalone', 'so-managersearch', 'so-node', 'so-heavynode', 'so-import'] %}
|
{% set ES_INCLUDED_NODES = ['so-eval', 'so-standalone', 'so-managersearch', 'so-node', 'so-heavynode', 'so-import'] %}
|
||||||
@@ -119,6 +119,7 @@ so-filebeat:
|
|||||||
- 0.0.0.0:514:514/udp
|
- 0.0.0.0:514:514/udp
|
||||||
- 0.0.0.0:514:514/tcp
|
- 0.0.0.0:514:514/tcp
|
||||||
- 0.0.0.0:5066:5066/tcp
|
- 0.0.0.0:5066:5066/tcp
|
||||||
|
|
||||||
- watch:
|
- watch:
|
||||||
- file: filebeatconf
|
- file: filebeatconf
|
||||||
- require:
|
- require:
|
||||||
@@ -128,7 +129,14 @@ so-filebeat:
|
|||||||
- x509: conf_filebeat_crt
|
- x509: conf_filebeat_crt
|
||||||
- x509: conf_filebeat_key
|
- x509: conf_filebeat_key
|
||||||
- x509: trusttheca
|
- x509: trusttheca
|
||||||
|
{% for module in MODULESMERGED.modules.keys() %}
|
||||||
|
{% for submodule in MODULESMERGED.modules[module] %}
|
||||||
|
{% if MODULESMERGED.modules[module][submodule].enabled and MODULESMERGED.modules[module][submodule]["var.syslog_port"] is defined %}
|
||||||
|
- {{ MODULESMERGED.modules[module][submodule].get("var.syslog_host", "0.0.0.0") }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}/tcp
|
||||||
|
- {{ MODULESMERGED.modules[module][submodule].get("var.syslog_host", "0.0.0.0") }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}/udp
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endfor %}
|
||||||
{% if grains.role in ES_INCLUDED_NODES %}
|
{% if grains.role in ES_INCLUDED_NODES %}
|
||||||
run_module_setup:
|
run_module_setup:
|
||||||
cmd.run:
|
cmd.run:
|
||||||
|
|||||||
Reference in New Issue
Block a user