Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev

files/master

@@ -12,6 +12,7 @@
 # modified files cause conflicts, set verify_env to False.
 # user: socore
 
+log_file: /opt/so/log/salt/master
 
 #####      File Server settings      #####
 ##########################################

salt/elasticsearch/init.sls

@@ -145,7 +145,9 @@ so-elasticsearch-pipelines:
  cmd.run:
    - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ esclustername }}
 
+{% if grains['role'] == 'so-master' or grains['role'] == "so-eval" or grains['role'] == "so-mastersearch" %}
 so-elasticsearch-templates:
   cmd.run:
     - name: /usr/sbin/so-elasticsearch-templates
     - cwd: /opt/so
+{% endif %}

salt/filebeat/etc/filebeat.yml

@@ -111,7 +111,7 @@ filebeat.inputs:
     clean_removed: false
     close_removed: false
 
-  {%- if STRELKAENABLED == '1' %}
+  {%- if STRELKAENABLED == 1 %}
 
   - type: log
     paths:
@@ -132,7 +132,7 @@ filebeat.inputs:
   {%- endif %}
 {%- endif %}
 
-{%- if WAZUHENABLED == '1' %}
+{%- if WAZUHENABLED == 1 %}
 
   - type: log
     paths:

setup/so-functions

@@ -325,6 +325,7 @@ configure_minion() {
 
   echo "use_superseded:" >> /etc/salt/minion
   echo "  - module.run" >> /etc/salt/minion
+  echo "log_file: /opt/so/log/salt/minion" >> /etc/salt/minion
   
   service salt-minion restart