From 1414b75e0151b6fd2d90352f188540aa5315d577 Mon Sep 17 00:00:00 2001
From: Wes <wlambertts@gmail.com>
Date: Wed, 25 Jan 2023 14:07:25 +0000
Subject: [PATCH] Allow 'elastic-fleet' state to be applied for Import Mode

---
 salt/top.sls   | 1 +
 setup/so-setup | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/salt/top.sls b/salt/top.sls
index e29d3b081..4b8531f4d 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -344,6 +344,7 @@ base:
     - zeek
     - schedule
     - docker_clean
+    - elastic-fleet
 
   '*_receiver and G@saltversion:{{saltversion}}':
     - match: compound
diff --git a/setup/so-setup b/setup/so-setup
index 5088395f3..08b16dfb8 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -577,9 +577,9 @@ if ! [[ -f $install_opt_file ]]; then
 		add_web_user
 		info "Restarting SOC to pick up initial user"
 		logCmd "so-soc-restart"
-		if [[ ! $is_import ]]; then
-			title "Setting up Elastic Fleet"
-			logCmd "so-elastic-fleet-setup"
+	        title "Setting up Elastic Fleet"
+	        logCmd "so-elastic-fleet-setup"
+	        if [[ ! $is_import ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"
 		fi