Skip to content

Content proxy fix #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsmith-sas merged 11 commits into from
Sep 9, 2025
Merged

Content proxy fix #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3714242
Housekeeping: lint remaining scripts in logging/bin
gsmith-sas Aug 21, 2025
e298a3e
Linting: shftmt (1)
gsmith-sas Aug 22, 2025
ed6308c
Linting: shfmt (2)
gsmith-sas Aug 22, 2025
1c4f9e6
Linting: shfmt (3)
gsmith-sas Aug 22, 2025
d3af130
Cleanup: remove unneeded temp file
gsmith-sas Aug 22, 2025
ec881d4
remove debugging code
gsmith-sas Aug 22, 2025
c9965d0
Linting: caved to the linters demands
gsmith-sas Aug 22, 2025
3f2ea2f
[FIX] Correct handling of unavailable API endpoint in deploy_opensear…
gsmith-sas Aug 25, 2025
e4085bd
linting
gsmith-sas Aug 25, 2025
fa6d0d0
Minor tweak
gsmith-sas Aug 26, 2025
167f3d3
Merge branch 'main' into content_proxy_fix
gsmith-sas Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
5 changes: 3 additions & 2 deletions logging/bin/deploy_opensearch_content.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down