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

Merge pull request #5 from TOoSmOotH/master

Browse Source 
Redis and Filebeat fixes to point to IP
This commit is contained in:
Mike Reeves
2018-10-18 21:20:41 -04:00
committed by GitHub
parent 6c7307c7fd 0161a41941
commit aa6b018d00
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/logstash/files/dynamic/0900_input_redis.conf
View File

@@ -1,4 +1,4 @@
{%- set master = grains['master'] %} {% set master = salt['pillar.get']('static:masterip', '') %}
input { input {
redis { redis {
host => '{{ master }}' host => '{{ master }}'

4
salt/logstash/files/dynamic/9999_output_redis.conf
View File

@@ -1,9 +1,9 @@
{%- if salt['grains.get']('role') == 'so-master' %} {%- if salt['grains.get']('role') == 'so-master' %}
{%- set master = salt['pillar.get']('master:mainip', '') -%} {% set master = salt['pillar.get']('static:masterip', '') %}
{%- set nodetype = 'master' %} {%- set nodetype = 'master' %}
{%- else %} {%- else %}
{%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %} {%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %}
{%- set master = grains['master'] %} {% set master = salt['pillar.get']('static:masterip', '') %}
{%- endif %} {%- endif %}
output { output {
redis { redis {

1
so-setup-network.sh
View File

@@ -409,6 +409,7 @@ master_static() {
echo " proxy: $PROXY" >> /opt/so/saltstack/pillar/static.sls echo " proxy: $PROXY" >> /opt/so/saltstack/pillar/static.sls
echo " broversion: $BROVERSION" >> /opt/so/saltstack/pillar/static.sls echo " broversion: $BROVERSION" >> /opt/so/saltstack/pillar/static.sls
echo " ids: $NIDS" >> /opt/so/saltstack/pillar/static.sls echo " ids: $NIDS" >> /opt/so/saltstack/pillar/static.sls
echo " masterip: $MAINIP" >> /opt/so/saltstack/pillar/static.sls
if [ $MASTERUPDATES == 'MASTER' ]; then if [ $MASTERUPDATES == 'MASTER' ]; then
echo " masterupdate: 1" >> /opt/so/saltstack/pillar/static.sls echo " masterupdate: 1" >> /opt/so/saltstack/pillar/static.sls
else else