Merge pull request #10360 from Security-Onion-Solutions/2.4/retry

2.4/retry

salt/elasticfleet/install_agent_grid.sls

@@ -9,7 +9,7 @@
 
 run_installer:
   cmd.script:
-    - name: salt://elasticfleet/files/so_agent-installers/so-elastic-agent_linux
+    - name: salt://elasticfleet/files/so_agent-installers/so-elastic-agent_linux_amd64
     - cwd: /opt/so
     - args: -token={{ GRIDNODETOKEN }}
 

salt/elasticfleet/tools/sbin_jinja/so-elastic-agent-gen-installers

@@ -10,10 +10,12 @@
 
 . /usr/sbin/so-common
 
+FLEETHOST="https://{{ GLOBALS.manager_ip }}:8220"
+
 for i in {1..30}
 do
    ENROLLMENTOKEN=$(curl -K /opt/so/conf/elasticsearch/curl.config -L "localhost:5601/api/fleet/enrollment_api_keys" -H 'kbn-xsrf: true' -H 'Content-Type: application/json'  | jq .list | jq -r -c '.[] | select(.policy_id | contains("endpoints")) | .api_key')
-   FLEETHOST=$(curl -K /opt/so/conf/elasticsearch/curl.config 'http://localhost:5601/api/fleet/fleet_server_hosts' | jq -r  '.items[].host_urls[]' | paste -sd ',')
+   #FLEETHOST=$(curl -K /opt/so/conf/elasticsearch/curl.config 'http://localhost:5601/api/fleet/fleet_server_hosts' | jq -r  '.items[].host_urls[]' | paste -sd ',')
 if [[ $FLEETHOST ]] && [[  $ENROLLMENTOKEN ]]; then break; else sleep 10; fi
 done
 if [[ -z $FLEETHOST ]] || [[ -z $ENROLLMENTOKEN ]]; then printf "\nFleet Host URL or Enrollment Token empty - exiting..." && exit; fi
@@ -47,7 +49,8 @@ done
 
 GOTARGETOS=( "linux" "windows" "darwin" "darwin/arm64" )
 GOARCH="amd64"
-printf "\n### Generating OS packages using the cleaned up tarballs"for GOOS in "${GOTARGETOS[@]}"
+printf "\n### Generating OS packages using the cleaned up tarballs"
+for GOOS in "${GOTARGETOS[@]}"
 do
     if [[ $GOOS == 'darwin/arm64' ]]; then GOOS="darwin" && GOARCH="arm64"; fi
     printf "\n\n### Generating $GOOS/$GOARCH Installer...\n"