CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-25 22:17:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

use heavynode hostname for certs if heavynode. changes to logstash pipeline for redis if heavynode

Browse Source
This commit is contained in:
m0duspwnens
2021-07-06 15:32:39 -04:00
parent ce0b064972
commit 0627ca2fc2
4 changed files with 42 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/logstash/init.sls
+9 -6
View File
@@ -36,6 +36,14 @@
{% set DOCKER_OPTIONS = salt['pillar.get']('logstash:docker_options', {}) %}
{% set TEMPLATES = salt['pillar.get']('elasticsearch:templates', {}) %}
{% if grains.role in ['so-heavynode'] %}
{% set EXTRAHOSTHOSTNAME = salt['grains.get']('host') %}
{% set EXTRAHOSTIP = salt['pillar.get']('sensor:mainip') %}
{% else %}
{% set EXTRAHOSTHOSTNAME = MANAGER %}
{% set EXTRAHOSTIP = MANAGERIP %}
{% endif %}
include:
- elasticsearch
@@ -145,12 +153,7 @@ so-logstash:
- name: so-logstash
- user: logstash
- extra_hosts:
{% if grains.role in ['so-heavynode'] %}
{% set MANAGER = salt['grains.get']('host') %}
{% set MANAGERIP = salt['pillar.get']('sensor:mainip') %}
{% else %}
- {{ MANAGER }}:{{ MANAGERIP }}
{% endif %}
- {{ EXTRAHOSTHOSTNAME }}:{{ EXTRAHOSTIP }}
- environment:
- LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
- port_bindings:
salt/logstash/pipelines/config/so/0900_input_redis.conf.jinja
+5 -6
View File
@@ -1,14 +1,13 @@
{%- if grains.role in ['so-heavynode'] %}
{%- set MANAGER = salt['grains.get']('host') %}
{%- set HOST = salt['grains.get']('host') %}
{%- else %}
{%- set MANAGER = salt['grains.get']('master') %}
{%- set HOST = salt['grains.get']('master') %}
{%- endif %}
{%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %}
{% set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %}
{%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %}
{%- set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %}
input {
redis {
host => '{{ MANAGER }}'
host => '{{ HOST }}'
port => 9696
ssl => true
data_type => 'list'
salt/logstash/pipelines/config/so/9999_output_redis.conf.jinja
+4 -4
View File
@@ -1,12 +1,12 @@
{%- if grains.role in ['so-heavynode'] %}
{%- set MANAGER = salt['grains.get']('host') %}
{%- set HOST = salt['grains.get']('host') %}
{%- else %}
{%- set MANAGER = salt['grains.get']('master') %}
{%- set HOST = salt['grains.get']('master') %}
{%- endif %}
{% set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %}
{%- set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %}
output {
redis {
host => '{{ MANAGER }}'
host => '{{ HOST }}'
port => 6379
data_type => 'list'
key => 'logstash:unparsed'