Merge pull request #290 from Security-Onion-Solutions/bugfix/filebeat

Fix Filebeat
This commit is contained in:
Mike Reeves
2020-01-30 15:49:24 -05:00
committed by GitHub
2 changed files with 8 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
{%- if grains.role == 'so-heavynode' %} {%- if grains.role == 'so-heavynode' %}
{%- set MASTER = grains.host %} {%- set MASTER = salt['pillar.get']('sensor:mainip' '') %}
{%- else %} {%- else %}
{%- set MASTER = grains['master'] %} {%- set MASTER = grains['master'] %}
{%- endif %} {%- endif %}

View File

@@ -13,14 +13,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %} {% set VERSION = salt['pillar.get']('static:soversion', 'HH1.1.4') %}
{% set MASTER = salt['grains.get']('master') %} {% set MASTER = salt['grains.get']('master') %}
{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %} {% set MASTERIP = salt['pillar.get']('static:masterip', '') %}
{% set FEATURES = salt['pillar.get']('elastic:features', False) %} {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
{% if FEATURES %} {% if FEATURES %}
{% set FEATURES = "-features" %} {% set FEATURES = "-features" %}
{% else %} {% else %}
{% set FEATURES = '' %} {% set FEATURES = '' %}
{% endif %} {% endif %}
# Filebeat Setup
filebeatetcdir: filebeatetcdir:
file.directory: file.directory:
- name: /opt/so/conf/filebeat/etc - name: /opt/so/conf/filebeat/etc