Merge pull request #1328 from Security-Onion-Solutions/issue/1281

Issue/1281

salt/top.sls

@@ -62,6 +62,7 @@ base:
     - common
     - telegraf
     - firewall
+    - nginx
     - pcap
     - suricata
     - healthcheck
@@ -286,6 +287,7 @@ base:
     {%- if WAZUH != 0 %}
     - wazuh
     {%- endif %}
+    - elasticsearch
     - logstash
     - curator
     - filebeat
@@ -331,6 +333,7 @@ base:
     {%- if WAZUH != 0 %}
     - wazuh
     {%- endif %}
+    - elasticsearch
     - logstash
     - redis
     - curator
@@ -368,6 +371,7 @@ base:
     {%- if WAZUH != 0 %}
     - wazuh
     {%- endif %}
+    - elasticsearch
     - logstash
     - redis
     - curator

setup/so-setup

@@ -680,8 +680,10 @@ fi
 	fi
 
 	if [[ "$STRELKA" = 1 ]]; then
-		set_progress_str 80 "$(print_salt_state_apply 'strelka')"
-		salt-call state.apply -l info strelka >> $setup_log 2>&1
+		if [[ $is_sensor ]]; then
+			set_progress_str 80 "$(print_salt_state_apply 'strelka')"
+			salt-call state.apply -l info strelka >> $setup_log 2>&1
+		fi
 		if [[ $STRELKARULES == 1 ]]; then
 			/usr/sbin/so-yara-update >> $setup_log 2>&1	
 		fi