From 10f28b7f28aef8176693f66e4f5253f80657c42d Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:42:30 -0400 Subject: [PATCH 1/2] UPGRADE: Log monitoring components (OS/OSD 2.19.3, FB 4.08) --- CHANGELOG.md | 10 ++++++++++ component_versions.env | 16 ++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 173e247c..0b76eefd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ # SAS Viya Monitoring for Kubernetes +## Unreleased +* **Logging** + * [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. + * [UPGRADE] OpenSearch Dashboards Helm chart upgraded from 2.30.0 to 2.31.0 + * [UPGRADE] Fluent Bit upgraded from 4.0.2 to 4.0.8 + * [UPGRADE] Fluent Bit Helm chart upgraded from 0.49.0 to 0.52.0 + * [UPGRADE] Elasticsearch Exporer Helm chart upgraded from 6.7.2 to 7.0.0 + * [UPGRADE] OpenSearch Data Source Plugin to Grafana upgraded from 2.28.0 to 2.29.1 + ## Version 1.2.41 (19AUG2025) * **Metrics** diff --git a/component_versions.env b/component_versions.env index e49f985c..3b6dabe3 100644 --- a/component_versions.env +++ b/component_versions.env @@ -11,28 +11,28 @@ #Elasticsearch Exporter ESEXPORTER_HELM_CHART_REPO=prometheus-community ESEXPORTER_HELM_CHART_NAME=prometheus-elasticsearch-exporter -ESEXPORTER_HELM_CHART_VERSION=6.7.2 +ESEXPORTER_HELM_CHART_VERSION=7.0.0 ES_EXPORTER_FULL_IMAGE="quay.io/prometheuscommunity/elasticsearch-exporter:v1.9.0" #Fluent Bit FLUENTBIT_HELM_CHART_REPO=fluent FLUENTBIT_HELM_CHART_NAME=fluent-bit -FLUENTBIT_HELM_CHART_VERSION=0.49.0 -FB_FULL_IMAGE="cr.fluentbit.io/fluent/fluent-bit:4.0.2" +FLUENTBIT_HELM_CHART_VERSION=0.52.0 +FB_FULL_IMAGE="cr.fluentbit.io/fluent/fluent-bit:4.0.8" FB_INITCONTAINER_FULL_IMAGE="docker.io/library/busybox:latest" #OpenSearch OPENSEARCH_HELM_CHART_REPO=opensearch OPENSEARCH_HELM_CHART_NAME=opensearch -OPENSEARCH_HELM_CHART_VERSION=2.34.0 -OS_FULL_IMAGE="docker.io/opensearchproject/opensearch:2.19.2" +OPENSEARCH_HELM_CHART_VERSION=2.35.0 +OS_FULL_IMAGE="docker.io/opensearchproject/opensearch:2.19.3" OS_SYSCTL_FULL_IMAGE="docker.io/library/busybox:latest" #OpenSearch Dashboards OSD_HELM_CHART_REPO=opensearch OSD_HELM_CHART_NAME=opensearch-dashboards -OSD_HELM_CHART_VERSION=2.30.0 -OSD_FULL_IMAGE="docker.io/opensearchproject/opensearch-dashboards:2.19.2" +OSD_HELM_CHART_VERSION=2.31.0 +OSD_FULL_IMAGE="docker.io/opensearchproject/opensearch-dashboards:2.19.3" #Grafana (when deployed on OpenShift) OPENSHIFT_GRAFANA_CHART_REPO=grafana @@ -43,7 +43,7 @@ OPENSHIFT_OAUTHPROXY_FULL_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:l #Grafana (everywhere) GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:12.1.0" GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.30.3" -GRAFANA_DATASOURCE_PLUGIN_VERSION="2.28.0" +GRAFANA_DATASOURCE_PLUGIN_VERSION="2.29.1" #Kube-Prometheus Stack KUBE_PROM_STACK_CHART_REPO=prometheus-community From 1fc2453886d9c5c1980ec716710676302ade31f3 Mon Sep 17 00:00:00 2001 From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com> Date: Fri, 29 Aug 2025 13:00:47 -0400 Subject: [PATCH 2/2] [FIX] Log messages from Prometheus Operator pod redirected to OpenSearch viya_ops-* --- CHANGELOG.md | 1 + logging/fb/fluent-bit_config.configmap_azmonitor.yaml | 6 +++--- logging/fb/fluent-bit_config.configmap_opensearch.yaml | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b76eefd..d4eec066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # SAS Viya Monitoring for Kubernetes ## Unreleased * **Logging** + * [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. * [UPGRADE] OpenSearch Dashboards Helm chart upgraded from 2.30.0 to 2.31.0 diff --git a/logging/fb/fluent-bit_config.configmap_azmonitor.yaml b/logging/fb/fluent-bit_config.configmap_azmonitor.yaml index 3b87e1da..1c4bbe7a 100644 --- a/logging/fb/fluent-bit_config.configmap_azmonitor.yaml +++ b/logging/fb/fluent-bit_config.configmap_azmonitor.yaml @@ -6,7 +6,7 @@ data: [FILTER] Name modify Match * - Set fb_configMap_version 0.2.27 + Set fb_configMap_version 0.2.28candidate #Set clusterID NOT_SET # initialized to N to force level standardization Set __temp_level_fixed N @@ -975,7 +975,7 @@ data: Name tail Alias tail4logs Path /var/log/containers/*.log - Exclude_Path /var/log/containers/v4m-*.log + Exclude_Path /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log Parser ${KUBERNETES_RUNTIME_LOGFMT} Tag kube.* Multiline.parser ${LOG_MULTILINE_PARSER} @@ -991,7 +991,7 @@ data: # NOTE: ** METALOGGING ** Name tail Alias tail4ops - Path /var/log/containers/v4m-*.log + Path /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log Parser ${KUBERNETES_RUNTIME_LOGFMT} Tag opsK.* Refresh_Interval 5 diff --git a/logging/fb/fluent-bit_config.configmap_opensearch.yaml b/logging/fb/fluent-bit_config.configmap_opensearch.yaml index a402cea2..1b138dfe 100644 --- a/logging/fb/fluent-bit_config.configmap_opensearch.yaml +++ b/logging/fb/fluent-bit_config.configmap_opensearch.yaml @@ -6,7 +6,7 @@ data: [FILTER] Name modify Match * - Set fb_configMap_version 0.2.27 + Set fb_configMap_version 0.2.28candidate #Set clusterID NOT_SET # initialized to N to force level standardization Set __temp_level_fixed N @@ -977,7 +977,7 @@ data: Name tail Alias tail4logs Path /var/log/containers/*.log - Exclude_Path /var/log/containers/v4m-*.log + Exclude_Path /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log Parser ${KUBERNETES_RUNTIME_LOGFMT} Tag kube.* Multiline.parser ${LOG_MULTILINE_PARSER} @@ -993,7 +993,7 @@ data: # NOTE: ** METALOGGING ** Name tail Alias tail4ops - Path /var/log/containers/v4m-*.log + Path /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log Parser ${KUBERNETES_RUNTIME_LOGFMT} Tag opsK.* Refresh_Interval 5