diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls index f40b1b669..274502f46 100644 --- a/salt/influxdb/init.sls +++ b/salt/influxdb/init.sls @@ -117,6 +117,14 @@ influxdb-setup: - file: influxdb_curl_config - docker_container: so-influxdb +metrics_link_file: + file.managed: + - name: /opt/so/saltstack/local/salt/influxdb/metrics_link.txt + - contents: {{ salt['cmd.run']('so-influxdb-manage dashboardpath "Security Onion Performance"') }} + - require: + - docker_container: so-influxdb + - cmd: influxdb-setup + # Install cron job to determine size of influxdb for telegraf get_influxdb_size: cron.present: diff --git a/salt/influxdb/metrics_link.txt b/salt/influxdb/metrics_link.txt new file mode 100644 index 000000000..e69de29bb diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja index 95bfb2a76..e16f047e4 100644 --- a/salt/soc/defaults.map.jinja +++ b/salt/soc/defaults.map.jinja @@ -2,13 +2,7 @@ {% 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"') %} -{% endif %} -{% endif %} - +{% import_text 'influxdb/metrics_link.txt' as METRICS_LINK %} {% for module, application_url in GLOBALS.application_urls.items() %} {% do SOCDEFAULTS.soc.server.modules[module].update({'hostUrl': application_url}) %}