From ce63e47fcdc5b134e9b94c048d35e0d86ee9eae4 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Fri, 11 Aug 2023 14:47:33 -0400 Subject: [PATCH] Enable forced update --- .../tools/sbin_jinja/so-elastic-fleet-es-url-update | 7 +++++++ salt/manager/tools/sbin/soup | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update index 481287eef..5d5b7e7e0 100644 --- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update +++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update @@ -46,6 +46,13 @@ NEW_LIST_JSON=$(jq --compact-output --null-input '$ARGS.positional' --args -- "$ NEW_HASH=$(sha1sum <<< "$NEW_LIST_JSON" | awk '{print $1}') # Compare the current & new list of URLs - if different, update the Fleet Elasticsearch URLs +if [ "$1" = "--force" ]; then + printf "\nUpdating List, since --force was specified.\n" + printf "Current List: $CURRENT_LIST\nNew List: $NEW_LIST_JSON\n" + update_es_urls + exit 0 +fi + if [ "$NEW_HASH" = "$CURRENT_HASH" ]; then printf "\nHashes match - no update needed.\n" printf "Current List: $CURRENT_LIST\nNew List: $NEW_LIST_JSON\n" diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index ebc9c8074..a41d60648 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -425,7 +425,8 @@ post_to_2.4.5() { } post_to_2.4.10() { - echo "Nothing to apply" + echo "Updating Elastic Fleet ES URLs...." + /sbin/so-elastic-fleet-es-url-update --force POSTVERSION=2.4.10 }