Merge pull request #1353 from Security-Onion-Solutions/fix/strelkaconfig

fix sensor mainip logic for strelka yaml files
This commit is contained in:
Josh Patterson
2020-09-16 10:32:58 -04:00
committed by GitHub
4 changed files with 8 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
{%- if grains.role in ['so-sensor', 'so-heavynode'] -%} {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
{%- set mainint = salt['pillar.get']('sensor:mainint') %} {%- set mainint = salt['pillar.get']('host:mainint') %}
{%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
{%- else %} {%- else %}
{%- set ip = salt['pillar.get']('global:managerip') %} {%- set ip = salt['pillar.get']('global:managerip') %}
{%- endif -%} {%- endif -%}

View File

@@ -1,6 +1,6 @@
{%- if grains.role in ['so-sensor', 'so-heavynode'] -%} {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
{%- set mainint = salt['pillar.get']('sensor:mainint') %} {%- set mainint = salt['pillar.get']('host:mainint') %}
{%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
{%- else %} {%- else %}
{%- set ip = salt['pillar.get']('global:managerip') %} {%- set ip = salt['pillar.get']('global:managerip') %}
{%- endif -%} {%- endif -%}

View File

@@ -1,6 +1,6 @@
{%- if grains.role in ['so-sensor', 'so-heavynode'] -%} {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
{%- set mainint = salt['pillar.get']('sensor:mainint') %} {%- set mainint = salt['pillar.get']('host:mainint') %}
{%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
{%- else %} {%- else %}
{%- set ip = salt['pillar.get']('global:managerip') %} {%- set ip = salt['pillar.get']('global:managerip') %}
{%- endif -%} {%- endif -%}

View File

@@ -1,6 +1,6 @@
{%- if grains.role in ['so-sensor', 'so-heavynode'] -%} {%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
{%- set mainint = salt['pillar.get']('sensor:mainint') %} {%- set mainint = salt['pillar.get']('host:mainint') %}
{%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
{%- else %} {%- else %}
{%- set ip = salt['pillar.get']('global:managerip') %} {%- set ip = salt['pillar.get']('global:managerip') %}
{%- endif -%} {%- endif -%}