CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-01-24 17:03:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5147 from Security-Onion-Solutions/issue/4674

Browse Source 
keep the list unique
This commit is contained in:
Mike Reeves
2021-08-13 17:39:54 -04:00
committed by GitHub
parent 7504b1cb2e a98ed282c0
commit 55e8a777d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/grafana/init.sls
View File

@@ -17,7 +17,7 @@
{% do DASHBOARDS.append('eval') %} {% do DASHBOARDS.append('eval') %}
{% else %} {% else %}
{# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #}
{% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}|uniq").split() %} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %}
{% do DASHBOARDS.append(dashboard) %} {% do DASHBOARDS.append(dashboard) %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@@ -93,7 +93,7 @@ so-grafana-dashboard-folder-delete:
- name: /usr/sbin/so-grafana-dashboard-folder-delete - name: /usr/sbin/so-grafana-dashboard-folder-delete
- unless: ls /opt/so/state/so-grafana-dashboard-folder-delete-complete - unless: ls /opt/so/state/so-grafana-dashboard-folder-delete-complete
{% for dashboard in DASHBOARDS %} {% for dashboard in DASHBOARDS | unique %}
{{dashboard}}-dashboard: {{dashboard}}-dashboard:
file.managed: file.managed:
- name: /opt/so/conf/grafana/grafana_dashboards/{{dashboard}}.json - name: /opt/so/conf/grafana/grafana_dashboards/{{dashboard}}.json