CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix state name duplicate conflict - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/739

Browse Source
This commit is contained in:
m0duspwnens
2020-06-11 10:39:30 -04:00
parent 32b4a2ff08
commit 985c55dd62
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/grafana/init.sls
View File

@@ -40,7 +40,7 @@ grafanadashmsdir:
- group: 939 - group: 939
- makedirs: True - makedirs: True
grafanadashmsdir: grafanadashsadir:
file.directory: file.directory:
- name: /opt/so/conf/grafana/grafana_dashboards/standalone - name: /opt/so/conf/grafana/grafana_dashboards/standalone
- user: 939 - user: 939
@@ -103,7 +103,7 @@ dashboard-master:
{% for SN, SNDATA in salt['pillar.get']('mastersearchtab', {}).items() %} {% for SN, SNDATA in salt['pillar.get']('mastersearchtab', {}).items() %}
{% set NODETYPE = SN.split('_')|last %} {% set NODETYPE = SN.split('_')|last %}
{% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %}
dashboard-master: dashboard-mastersearch:
file.managed: file.managed:
- name: /opt/so/conf/grafana/grafana_dashboards/mastersearch/{{ SN }}-MasterSearch.json - name: /opt/so/conf/grafana/grafana_dashboards/mastersearch/{{ SN }}-MasterSearch.json
- user: 939 - user: 939
@@ -126,7 +126,7 @@ dashboard-master:
{% for SN, SNDATA in salt['pillar.get']('standalonetab', {}).items() %} {% for SN, SNDATA in salt['pillar.get']('standalonetab', {}).items() %}
{% set NODETYPE = SN.split('_')|last %} {% set NODETYPE = SN.split('_')|last %}
{% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %}
dashboard-master: dashboard-standalone:
file.managed: file.managed:
- name: /opt/so/conf/grafana/grafana_dashboards/standalone/{{ SN }}-Standalone.json - name: /opt/so/conf/grafana/grafana_dashboards/standalone/{{ SN }}-Standalone.json
- user: 939 - user: 939