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

Common Module - Change Grafana init

Browse Source
This commit is contained in:
Mike Reeves
2018-11-21 14:21:52 -05:00
parent a136e112c7
commit 1cae809885
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/data/addtotab.sh
View File

@@ -14,8 +14,8 @@ else
echo " $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls echo " $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls
echo " ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls echo " ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls
if [ $TYPE == 'sensorstab' ]; then if [ $TYPE == 'sensorstab' ]; then
echo " manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls echo " manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
echo " monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls echo " monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
fi fi
salt-call state.apply utility salt-call state.apply utility

8
salt/common/init.sls
View File

@@ -245,7 +245,7 @@ grafanaconf:
- source: salt://common/grafana/etc - source: salt://common/grafana/etc
{% if salt['pillar.get']('sensorstab', False) %} {% if salt['pillar.get']('sensorstab', False) %}
{%- for SN, SIP, MAININT, MONINT in salt['pillar.get']('sensorstab', {}).iteritems() %}} {%- for SN, SNDATA in salt['pillar.get']('sensorstab', {}).iteritems() %}
dashboard-{{ SN }}: dashboard-{{ SN }}:
file.managed: file.managed:
- name: /opt/so/conf/grafana/grafana_dashboards/{{ SN }}-Sensor.json - name: /opt/so/conf/grafana/grafana_dashboards/{{ SN }}-Sensor.json
@@ -254,13 +254,13 @@ dashboard-{{ SN }}:
- template: jinja - template: jinja
- source: salt://common/grafana/grafana_dashboards/sensor.json - source: salt://common/grafana/grafana_dashboards/sensor.json
- defaults: - defaults:
- SERVERNAME: {{ SN }} SERVERNAME: {{ SN }}
- INT: {{ MAININT }} INT: {{ SNDATA.monint }}
- MON: {{ MONINT }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
# Install the docker. This needs to be behind nginx at some point # Install the docker. This needs to be behind nginx at some point
so-grafana: so-grafana:
docker_container.running: docker_container.running: