removing time logging changes

inform which state is being applied
run a final highstate on managers prior to verify
2026-01-17 05:31:34 +01:00 · 2026-01-16 18:31:45 -05:00 · 2026-01-16 18:27:24 -05:00 · 2026-01-16 17:42:58 -05:00 · 2026-01-16 17:42:00 -05:00 · 2026-01-16 16:43:10 -05:00
2 changed files with 6 additions and 0 deletions
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup
@@ -241,9 +241,11 @@ printf '%s\n'\
    "" >> "$global_pillar_file"

 # Call Elastic-Fleet Salt State
+printf "\nApplying elasticfleet state"
 salt-call state.apply elasticfleet queue=True

 # Generate installers & install Elastic Agent on the node
 so-elastic-agent-gen-installers
+printf "\nApplying elasticfleet.install_agent_grid state"
 salt-call state.apply elasticfleet.install_agent_grid queue=True
 exit 0
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -831,6 +831,10 @@ if ! [[ -f $install_opt_file ]]; then
 		fi
 		checkin_at_boot
 		set_initial_firewall_access
+		# run a final highstate before enabling scheduled highstates. 
+		# this will ensure so-elasticsearch-ilm-policy-load and so-elasticsearch-templates-load have a chance to run after elasticfleet is setup
+		info "Running final highstate for setup"
+		logCmd "salt-call state.highstate -l info"
 		logCmd "salt-call schedule.enable -linfo --local"
 		verify_setup
 	else
Author	SHA1	Message	Date
Josh Patterson	6f4b96b61b	removing time logging changes	2026-01-16 18:31:45 -05:00
Josh Patterson	9905d23976	inform which state is being applied	2026-01-16 18:27:24 -05:00
Josh Patterson	17532fe49d	run a final highstate on managers prior to verify	2026-01-16 17:42:58 -05:00
Josh Patterson	074158b495	discard so-elasticsearch-templates-load running again during setup	2026-01-16 17:42:00 -05:00
Josh Patterson	82d5115b3f	rerun so-elasticsearch-templates-load during setup	2026-01-16 16:43:10 -05:00
Josh Patterson	5c63111002	add timing to scripts to allow for debugging delays	2026-01-16 16:42:24 -05:00