From 7168c4f91a135ec4440804362a39a54493a411c8 Mon Sep 17 00:00:00 2001
From: Doug Burks <doug.burks@gmail.com>
Date: Mon, 19 Dec 2022 16:48:35 -0500
Subject: [PATCH 1/3] fix import in so-setup

---
 setup/so-setup | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 35502f759..84f3ecaad 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -429,11 +429,22 @@ if ! [[ -f $install_opt_file ]]; then
 		whiptail_end_settings
 
 	elif [[ $is_import ]]; then
+		waitforstate=true
+		monints=true
+		check_elastic_license
 		check_requirements "import"
 		networking_needful
-		collect_mngr_hostname
-		add_mngr_ip_to_hosts
-		check_manager_connection
+		whiptail_airgap
+		detect_cloud
+		set_minion_info
+		set_default_log_size >> $setup_log 2>&1
+		info "Verifying all network devices are managed by Network Manager that should be"
+		check_network_manager_conf
+		set_network_dev_status_list
+		calculate_useable_cores
+		collect_webuser_inputs
+		get_redirect
+		collect_so_allow
 		whiptail_end_settings
 
 	elif [[ $is_receiver ]]; then

From 9d8951ceb8591c6d96049f3dc19a8b4806244975 Mon Sep 17 00:00:00 2001
From: doug <doug.burks@gmail.com>
Date: Mon, 19 Dec 2022 16:55:16 -0500
Subject: [PATCH 2/3] fix import

---
 pillar/top.sls                   |  5 ++++-
 salt/common/tools/sbin/so-minion | 31 ++++++++++++++++++-------------
 salt/vars/import.map.jinja       | 13 +++++++++++++
 3 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 salt/vars/import.map.jinja

diff --git a/pillar/top.sls b/pillar/top.sls
index 0d713d64d..d7f0663fd 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -146,9 +146,12 @@ base:
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
     - kibana.secrets
     {% endif %}
+    - kratos.soc_kratos
+    - elasticsearch.soc_elasticsearch
+    - manager.soc_manager
+    - soc.soc_soc
     - soc_global
     - adv_global
-    - manager.soc_manager
     - backup.soc_backup
     - backup.adv_backup
     - minions.{{ grains.id }}
diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion
index 609ce184a..7e4932ba0 100755
--- a/salt/common/tools/sbin/so-minion
+++ b/salt/common/tools/sbin/so-minion
@@ -165,7 +165,21 @@ function add_sensor_to_minion() {
 	echo "    enabled: True" >> $PILLARFILE
 }
 
-function createSTANDALONE() {
+function createEVAL() {
+	add_elastic_to_minion
+	add_sensor_to_minion
+}
+
+function createIDHNODE() {
+	echo "Nothing custom needed for IDH nodes"
+}
+
+function createIMPORT() {
+	add_elastic_to_minion
+	add_sensor_to_minion
+}
+
+function createHEAVYNODE() {
 	add_elastic_to_minion
 	add_sensor_to_minion
 }
@@ -178,16 +192,6 @@ function createMASTERSEARCH() {
 	add_elastic_to_minion
 }
 
-function createHEAVYNODE() {
-	add_elastic_to_minion
-	add_sensor_to_minion
-}
-
-function createEVAL() {
-	add_elastic_to_minion
-	add_sensor_to_minion
-}
-
 function createSENSOR() {
 	add_sensor_to_minion
 }
@@ -196,8 +200,9 @@ function createSEARCHNODE() {
 	add_elastic_to_minion
 }
 
-function createIDHNODE() {
-	echo "Nothing custom needed for IDH nodes"
+function createSTANDALONE() {
+	add_elastic_to_minion
+	add_sensor_to_minion
 }
 
 function testConnection() {
diff --git a/salt/vars/import.map.jinja b/salt/vars/import.map.jinja
new file mode 100644
index 000000000..198db31dd
--- /dev/null
+++ b/salt/vars/import.map.jinja
@@ -0,0 +1,13 @@
+{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %}
+
+{% set ROLE_GLOBALS = {} %}
+
+{% set IMPORT_GLOBALS =
+   [
+     ELASTICSEARCH_GLOBALS
+   ]
+%}
+
+{% for sg in IMPORT_GLOBALS %}
+{%   do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %}
+{% endfor %}

From cd55be2f839840c0368497e62a419e32886e4fd8 Mon Sep 17 00:00:00 2001
From: doug <doug.burks@gmail.com>
Date: Mon, 19 Dec 2022 16:58:43 -0500
Subject: [PATCH 3/3] move IMPORT to top of list

---
 setup/so-whiptail | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/so-whiptail b/setup/so-whiptail
index 44e0f9c18..3eaf7fc68 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -461,10 +461,10 @@ whiptail_install_type() {
 	# What kind of install are we doing?
 	install_type=$(whiptail --title "$whiptail_title" --radiolist \
 	"What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \
-		"EVAL" "Evaluation mode (not for production) " ON \
+		"IMPORT" "Import PCAP or log files " ON \
+		"EVAL" "Evaluation mode (not for production) " OFF \
 		"STANDALONE" "Standalone production install " OFF \
 		"DISTRIBUTED" "Distributed install submenu " OFF \
-		"IMPORT" "Standalone to import PCAP or log files " OFF \
 		"OTHER" "Other install types" OFF \
 		3>&1 1>&2 2>&3
 	)