diff --git a/CHANGELOG.md b/CHANGELOG.md index d4eec066..9e4fa24b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # SAS Viya Monitoring for Kubernetes ## Unreleased * **Logging** + * [FIX] Corrected handling of unavailable API endpoint in deploy_opensearch_content.sh * [FIX] Log messages from Prometheus Operator pod redirected to OpenSearch viya_ops-* (rather than viya_logs-*) index * [UPGRADE] OpenSearch and OpenSearch Dashboards upgraded from 2.19.2 to 2.19.3 * [UPGRADE] OpenSearch Helm chart upgraded from 2.34.0 to 2.35.0. diff --git a/logging/bin/deploy_opensearch_content.sh b/logging/bin/deploy_opensearch_content.sh index 0302e6dc..9a656cc1 100755 --- a/logging/bin/deploy_opensearch_content.sh +++ b/logging/bin/deploy_opensearch_content.sh @@ -23,10 +23,9 @@ fi log_info "Loading Content into OpenSearch" # temp file used to capture command output +# shellcheck disable=SC2034 tmpfile=$TMP_DIR/output.txt -set -e - # check for pre-reqs # Confirm namespace exists @@ -169,6 +168,8 @@ function add_ism_template { fi } +set -e + LOG_RETENTION_PERIOD="${LOG_RETENTION_PERIOD:-3}" set_retention_period viya_logs_idxmgmt_policy LOG_RETENTION_PERIOD add_ism_template "viya_logs_idxmgmt_policy" "viya_logs-*" 100