Merge pull request #565 from Security-Onion-Solutions/issue/551

Issue/551

salt/_modules/healthcheck.py

@@ -78,18 +78,19 @@ def zeek():
   retcode = __salt__['zeekctl.status'](verbose=False)
   logging.debug('healthcheck_module: zeekctl.status retcode: %i' % retcode)
   if retcode:
-    zeek_restart = True
+    zeek_restart = 1
     if calling_func != 'beacon':
       docker_stop('so-zeek')
       states_to_apply.append('zeek')
   else:
-    zeek_restart = False
+    zeek_restart = 0
 
+  __salt__['telegraf.send']('healthcheck zeek_restart=%i' % zeek_restart)
+  
   if calling_func == 'execute' and zeek_restart:
     apply_states()
   
   retval.append({'zeek_restart': zeek_restart})
 
   send_event('so/healthcheck/zeek', retval)
-  __salt__['telegraf.send']('healthcheck zeek_restart=%s' % str(zeek_restart))
   return retval

salt/common/grafana/etc/dashboards/dashboard.yml

@@ -10,13 +10,13 @@ providers:
   editable: true
   options:
     path: /etc/grafana/grafana_dashboards/master
-- name: 'Forward Nodes'
-  folder: 'Forward Nodes'
+- name: 'Sensor Nodes'
+  folder: 'Sensor Nodes'
   type: file
   disableDeletion: false
   editable: true
   options:
-    path: /etc/grafana/grafana_dashboards/forward_nodes
+    path: /etc/grafana/grafana_dashboards/sensor_nodes
 - name: 'Search Nodes'
   folder: 'Search Nodes'
   type: file

salt/common/init.sls

@@ -282,7 +282,7 @@ grafanadashevaldir:
 
 grafanadashfndir:
   file.directory:
-    - name: /opt/so/conf/grafana/grafana_dashboards/forward_nodes
+    - name: /opt/so/conf/grafana/grafana_dashboards/sensor_nodes
     - user: 939
     - group: 939
     - makedirs: True
@@ -331,11 +331,11 @@ dashboard-master:
 {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %}
 dashboard-{{ SN }}:
   file.managed:
-    - name: /opt/so/conf/grafana/grafana_dashboards/forward_nodes/{{ SN }}-Sensor.json
+    - name: /opt/so/conf/grafana/grafana_dashboards/sensor_nodes/{{ SN }}-Sensor.json
     - user: 939
     - group: 939
     - template: jinja
-    - source: salt://common/grafana/grafana_dashboards/forward_nodes/sensor.json
+    - source: salt://common/grafana/grafana_dashboards/sensor_nodes/sensor.json
     - defaults:
       SERVERNAME: {{ SN }}
       MONINT: {{ SNDATA.monint }}