From 8632606a24ec1c2ef8b4510864f412da6d2ddb2f Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 27 Feb 2023 15:37:35 -0500 Subject: [PATCH 1/2] Update defaults.map.jinja --- salt/soc/defaults.map.jinja | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja index ff23914ec..eb9e57cb3 100644 --- a/salt/soc/defaults.map.jinja +++ b/salt/soc/defaults.map.jinja @@ -1,11 +1,13 @@ {% import_yaml 'soc/defaults.yaml' as SOCDEFAULTS %} {% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'docker/docker.map.jinja' import DOCKER -%} -{%- set INFLUXDB_TOKEN = salt['pillar.get']('secrets:influx_token') %} -{% if salt['docker.pid']('so-influxdb') > 0 %} -{%- set METRICS_LINK = salt['cmd.run']('so-influxdb-manage dashboardpath "Security Onion Performance"') %} -{% else %} -{% set METRICS_LINK = '' %} +{% set INFLUXDB_TOKEN = salt['pillar.get']('secrets:influx_token') %} +{% if salt['docker.exists']('so-influxdb') %} +{% if salt['docker.pid']('so-influxdb') > 0 %} +{% set METRICS_LINK = salt['cmd.run']('so-influxdb-manage dashboardpath "Security Onion Performance"') %} +{% else %} +{% set METRICS_LINK = '' %} +{% endif %} {% endif %} From cbcd3c9dd9dff3456e933f66fbe200710122a11b Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 27 Feb 2023 15:39:03 -0500 Subject: [PATCH 2/2] Update defaults.map.jinja --- salt/soc/defaults.map.jinja | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja index eb9e57cb3..95bfb2a76 100644 --- a/salt/soc/defaults.map.jinja +++ b/salt/soc/defaults.map.jinja @@ -2,11 +2,10 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'docker/docker.map.jinja' import DOCKER -%} {% set INFLUXDB_TOKEN = salt['pillar.get']('secrets:influx_token') %} +{% set METRICS_LINK = '' %} {% if salt['docker.exists']('so-influxdb') %} {% if salt['docker.pid']('so-influxdb') > 0 %} {% set METRICS_LINK = salt['cmd.run']('so-influxdb-manage dashboardpath "Security Onion Performance"') %} -{% else %} -{% set METRICS_LINK = '' %} {% endif %} {% endif %}