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

rename EXTRA_NODES to LOGSTASH_NODES AND REDIS_NODES

Browse Source
This commit is contained in:
m0duspwnens
2021-12-14 23:43:06 -05:00
parent 0c6aba16ec
commit 024860d0ae
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/filebeat/init.sls
View File

@@ -20,7 +20,7 @@
{% set MANAGER = salt['grains.get']('master') %} {% set MANAGER = salt['grains.get']('master') %}
{% from 'filebeat/map.jinja' import THIRDPARTY with context %} {% from 'filebeat/map.jinja' import THIRDPARTY with context %}
{% from 'filebeat/map.jinja' import SO with context %} {% from 'filebeat/map.jinja' import SO with context %}
{% from 'filebeat/map.jinja' import EXTRA_HOSTS with context %} {% from 'filebeat/map.jinja' import LOGSTASH_NODES 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'] %}
include: include:
@@ -109,7 +109,7 @@ so-filebeat:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-filebeat:{{ VERSION }} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-filebeat:{{ VERSION }}
- hostname: so-filebeat - hostname: so-filebeat
- user: root - user: root
- extra_hosts: {{ EXTRA_HOSTS }} - extra_hosts: {{ LOGSTASH_NODES }}
- binds: - binds:
- /nsm:/nsm:ro - /nsm:/nsm:ro
- /opt/so/log/filebeat:/usr/share/filebeat/logs:rw - /opt/so/log/filebeat:/usr/share/filebeat/logs:rw

6
salt/filebeat/map.jinja
View File

@@ -6,7 +6,7 @@
{#% set SO = salt['pillar.get']('filebeat:third_party_filebeat', default=SODEFAULTS.third_party_filebeat, merge=True) %#} {#% set SO = salt['pillar.get']('filebeat:third_party_filebeat', default=SODEFAULTS.third_party_filebeat, merge=True) %#}
{% set role = grains.role %} {% set role = grains.role %}
{% set EXTRA_HOSTS = [] %} {% set LOGSTASH_NODES = [] %}
{% set mainint = salt['pillar.get']('host:mainint') %} {% set mainint = salt['pillar.get']('host:mainint') %}
{% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %} {% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %}
{% if role in ['so-sensor', 'so-fleet', 'so-node' ] %} {% if role in ['so-sensor', 'so-fleet', 'so-node' ] %}
@@ -14,10 +14,10 @@
{% for node_type, node_details in node_data.items() | sort %} {% for node_type, node_details in node_data.items() | sort %}
{% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %} {% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %}
{% for hostname in node_data[node_type].keys() %} {% for hostname in node_data[node_type].keys() %}
{% do EXTRA_HOSTS.append({hostname:node_details[hostname].ip}) %} {% do LOGSTASH_NODES.append({hostname:node_details[hostname].ip}) %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% do EXTRA_HOSTS.append({grains.host:localhostip}) %} {% do LOGSTASH_NODES.append({grains.host:localhostip}) %}
{% endif %} {% endif %}

4
salt/logstash/init.sls
View File

@@ -43,7 +43,7 @@
{% set EXTRAHOSTHOSTNAME = MANAGER %} {% set EXTRAHOSTHOSTNAME = MANAGER %}
{% set EXTRAHOSTIP = MANAGERIP %} {% set EXTRAHOSTIP = MANAGERIP %}
{% endif #} {% endif #}
{% from 'logstash/map.jinja' import EXTRA_HOSTS with context %} {% from 'logstash/map.jinja' import REDIS_NODES with context %}
include: include:
- ssl - ssl
@@ -156,7 +156,7 @@ so-logstash:
- hostname: so-logstash - hostname: so-logstash
- name: so-logstash - name: so-logstash
- user: logstash - user: logstash
- extra_hosts: {{ EXTRA_HOSTS }} - extra_hosts: {{ REDIS_NODES }}
- environment: - environment:
- LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }} - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
- port_bindings: - port_bindings:

6
salt/logstash/map.jinja
View File

@@ -1,5 +1,5 @@
{% set role = grains.role %} {% set role = grains.role %}
{% set EXTRA_HOSTS = [] %} {% set REDIS_NODES = [] %}
{% set mainint = salt['pillar.get']('host:mainint') %} {% set mainint = salt['pillar.get']('host:mainint') %}
{% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %} {% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %}
{% if role in ['so-node'] %} {% if role in ['so-node'] %}
@@ -7,10 +7,10 @@
{% for node_type, node_details in node_data.items() | sort %} {% for node_type, node_details in node_data.items() | sort %}
{% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %} {% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %}
{% for hostname in node_data[node_type].keys() %} {% for hostname in node_data[node_type].keys() %}
{% do EXTRA_HOSTS.append({hostname:node_details[hostname].ip}) %} {% do REDIS_NODES.append({hostname:node_details[hostname].ip}) %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% do EXTRA_HOSTS.append({grains.host:localhostip}) %} {% do REDIS_NODES.append({grains.host:localhostip}) %}
{% endif %} {% endif %}