From b520c1abb777a479df05e7e033edfa7b57b37d77 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Wed, 2 Aug 2023 10:36:40 -0400
Subject: [PATCH] Allow multiple Custom Fleet FQDN

---
 salt/elasticfleet/defaults.yaml                  |  3 ++-
 salt/elasticfleet/soc_elasticfleet.yaml          |  2 +-
 .../sbin_jinja/so-elastic-fleet-outputs-update   | 14 +++++++++-----
 .../sbin_jinja/so-elastic-fleet-urls-update      | 16 ++++++++++------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/salt/elasticfleet/defaults.yaml b/salt/elasticfleet/defaults.yaml
index 3d806d63f..62a1302c1 100644
--- a/salt/elasticfleet/defaults.yaml
+++ b/salt/elasticfleet/defaults.yaml
@@ -2,7 +2,8 @@ elasticfleet:
   enabled: False
   config:
     server:
-      custom_fqdn: ''
+      custom_fqdn:
+        - ''
       enable_auto_configuration: True
       endpoints_enrollment: ''
       es_token: ''
diff --git a/salt/elasticfleet/soc_elasticfleet.yaml b/salt/elasticfleet/soc_elasticfleet.yaml
index 9b918f0ac..772e68181 100644
--- a/salt/elasticfleet/soc_elasticfleet.yaml
+++ b/salt/elasticfleet/soc_elasticfleet.yaml
@@ -12,7 +12,7 @@ elasticfleet:
   config:
     server:
       custom_fqdn:
-        description: Custom FQDN for Agents to connect to.
+        description: Custom FQDN for Agents to connect to. One per line.
         global: True
         helpLink: elastic-fleet.html
         advanced: True
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-outputs-update b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-outputs-update
index 042084d84..400a6224f 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-outputs-update
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-outputs-update
@@ -2,7 +2,6 @@
 # or more contributor license agreements. Licensed under the Elastic License 2.0; you may not use
 # this file except in compliance with the Elastic License 2.0.
 {% from 'vars/globals.map.jinja' import GLOBALS %}
-{% set CUSTOMFQDN = salt['pillar.get']('elasticfleet:config:server:custom_fqdn') %}
 
 . /usr/sbin/so-common
 
@@ -41,10 +40,15 @@ else
     NEW_LIST=("{{ GLOBALS.url_base }}:5055" "{{ GLOBALS.hostname }}:5055")
 fi
 
-{% if CUSTOMFQDN != "" %}
-# Add Custom Hostname to list
-NEW_LIST+=("{{ CUSTOMFQDN }}:5055")
-{% endif %}
+# Query for FQDN entries & add them to the list
+CUSTOMFQDNLIST=$( salt-call --out=json pillar.get elasticfleet:config:server:custom_fqdn | jq -r '.local | .[]')
+if [ -n "$CUSTOMFQDNLIST" ]; then
+    readarray -t CUSTOMFQDN <<< $CUSTOMFQDNLIST
+    for CUSTOMNAME in "${CUSTOMFQDN[@]}"
+    do
+    NEW_LIST+=("$CUSTOMNAME:5055")
+    done
+fi
 
 # Query for the current Grid Nodes that are running Logstash
 LOGSTASHNODES=$(salt-call --out=json pillar.get logstash:nodes | jq '.local')
diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-urls-update b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-urls-update
index 4a744665a..52727780d 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-urls-update
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-urls-update
@@ -2,7 +2,6 @@
 # or more contributor license agreements. Licensed under the Elastic License 2.0; you may not use
 # this file except in compliance with the Elastic License 2.0.
 {% from 'vars/globals.map.jinja' import GLOBALS %}
-{% set CUSTOMFQDN = salt['pillar.get']('elasticfleet:config:server:custom_fqdn') %}
 
 . /usr/sbin/so-common
 
@@ -41,10 +40,15 @@ else
     NEW_LIST=("https://{{ GLOBALS.url_base }}:8220" "https://{{ GLOBALS.hostname }}:8220")
 fi
 
-{% if CUSTOMFQDN != "" %}
-# Add Custom Hostname to list
-NEW_LIST+=("https://{{ CUSTOMFQDN }}:8220")
-{% endif %}
+# Query for FQDN entries & add them to the list
+CUSTOMFQDNLIST=$( salt-call --out=json pillar.get elasticfleet:config:server:custom_fqdn | jq -r '.local | .[]')
+if [ -n "$CUSTOMFQDNLIST" ]; then
+    readarray -t CUSTOMFQDN <<< $CUSTOMFQDNLIST
+    for CUSTOMNAME in "${CUSTOMFQDN[@]}"
+    do
+    NEW_LIST+=("https://$CUSTOMNAME:8220")
+    done
+fi
 
 # Query for the current Grid Nodes that are running Logstash (which includes Fleet Nodes)
 LOGSTASHNODES=$(salt-call --out=json pillar.get logstash:nodes | jq '.local')
@@ -71,5 +75,5 @@ else
     printf "\nHashes don't match - update needed.\n"
     printf "Current List: $CURRENT_LIST\nNew List: $NEW_LIST_JSON\n"
     update_fleet_urls
-    /sbin/so-elastic-agent-gen-installers &
+    /sbin/so-elastic-agent-gen-installers >> /opt/so/log/elasticfleet/so-elastic-agent-gen-installers.log &
 fi