CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-06-19 16:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

use --fail flag without set -x, since elasticsearch can return a 404 on the template lookup

Browse Source
This commit is contained in:
reyesj2
2026-06-16 11:17:04 -05:00
parent 4456bde1c8
commit 3daed551df
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/manager/tools/sbin/soup
+4 -8
View File
@@ -783,18 +783,14 @@ pin_elasticsearch_data_retention_method() {
#
# Reference: https://github.com/elastic/kibana/issues/263048
kibana_backport_streams_index_template() {
local current_template updated_template current_template_exists
local current_template updated_template
current_template_exists=$(so-elasticsearch-query "_index_template/.kibana_streams" -o /dev/null -w "%{http_code}")
if [[ "$current_template_exists" == "404" ]]; then
set +e
if ! current_template=$(so-elasticsearch-query "_index_template/.kibana_streams" --retry 3 --retry-delay 5 --fail); then
echo "Index template .kibana_streams does not exist, skipping backport."
return 0
fi
if ! current_template=$(so-elasticsearch-query "_index_template/.kibana_streams" --retry 3 --retry-delay 5 --fail); then
echo "Unable to retrieve .kibana_streams index template, skipping backport."
return 0
fi
set -e
updated_template=$(jq '.index_templates[0].index_template | .template.settings += {"index.auto_expand_replicas": "0-1"} | del(.created_date_millis, .modified_date_millis)' <<< "$current_template")