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

salt/elasticsearch/templates/so/so-common-template.json

@@ -228,7 +228,11 @@
         "event":{
           "type":"object",
           "dynamic": true
-        }, 
+        },
+        "event_data":{
+          "type":"object",
+          "dynamic": true
+        },	
         "file":{
           "type":"object",
           "dynamic": true

setup/so-setup

@@ -291,7 +291,7 @@ if ! [[ -f $install_opt_file ]]; then
 		collect_hostname
 	fi
 
-	whiptail_node_description
+	[[ ! ( $is_eval || $is_import ) ]] && whiptail_node_description
 
 	if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
 		network_init_whiptail
@@ -960,4 +960,4 @@ fi
 
 install_cleanup >> "$setup_log" 2>&1
 
-if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi
+if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi