From 985c55dd62c61be1c667a6bb18bad56dab9ba28e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 11 Jun 2020 10:39:30 -0400 Subject: [PATCH] fix state name duplicate conflict - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/739 --- salt/grafana/init.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 901e383e4..d3c457944 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -40,7 +40,7 @@ grafanadashmsdir: - group: 939 - makedirs: True -grafanadashmsdir: +grafanadashsadir: file.directory: - name: /opt/so/conf/grafana/grafana_dashboards/standalone - user: 939 @@ -103,7 +103,7 @@ dashboard-master: {% for SN, SNDATA in salt['pillar.get']('mastersearchtab', {}).items() %} {% set NODETYPE = SN.split('_')|last %} {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} -dashboard-master: +dashboard-mastersearch: file.managed: - name: /opt/so/conf/grafana/grafana_dashboards/mastersearch/{{ SN }}-MasterSearch.json - user: 939 @@ -126,7 +126,7 @@ dashboard-master: {% for SN, SNDATA in salt['pillar.get']('standalonetab', {}).items() %} {% set NODETYPE = SN.split('_')|last %} {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} -dashboard-master: +dashboard-standalone: file.managed: - name: /opt/so/conf/grafana/grafana_dashboards/standalone/{{ SN }}-Standalone.json - user: 939