Merge branch 'main' into content_proxy_fix

Author: gsmith-sas

ARTIFACT_INVENTORY.md

@@ -16,11 +16,11 @@ registry/repository/image_name:version
 
 | Subsystem| Component | Fully Qualified Container-Image Name (registry/repository/image_name:version)|
 |----|----|----|
-| Logging | [Fluent Bit](https://github.com/fluent/fluent-bit) | cr.fluentbit.io/fluent/fluent-bit:4.0.2 |
+| Logging | [Fluent Bit](https://github.com/fluent/fluent-bit) | cr.fluentbit.io/fluent/fluent-bit:4.0.8 |
 | Logging | [Elasticsearch Exporter](https://github.com/prometheus-community/elasticsearch_exporter) | quay.io/prometheuscommunity/elasticsearch-exporter:v1.9.0 |
 | Logging | initContainer (Fluent Bit, OpenSearch) | docker.io/library/busybox:latest |
-| Logging | [OpenSearch](https://github.com/opensearch-project/OpenSearch) | docker.io/opensearchproject/opensearch:2.19.2 |
-| Logging | [OpenSearch Dashboards](https://github.com/opensearch-project/OpenSearch-Dashboards) | docker.io/opensearchproject/opensearch-dashboards:2.19.2 |
+| Logging | [OpenSearch](https://github.com/opensearch-project/OpenSearch) | docker.io/opensearchproject/opensearch:2.19.3 |
+| Logging | [OpenSearch Dashboards](https://github.com/opensearch-project/OpenSearch-Dashboards) | docker.io/opensearchproject/opensearch-dashboards:2.19.3 |
 | Metrics | [Alertmanager](https://github.com/prometheus/alertmanager) | quay.io/prometheus/alertmanager:v0.28.1 |
 | Metrics | [Grafana](https://github.com/grafana/grafana) | docker.io/grafana/grafana:12.1.0 |
 | Metrics | [Admission Webhook](https://github.com/kubernetes/ingress-nginx) | registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0 |
@@ -50,10 +50,10 @@ This table identifies the Helm charts used by SAS Viya Monitoring for Kubernetes
 
 | Subsystem | Component | Helm Chart Repository | Helm Chart Name |Helm Chart Version | Helm Archive File Name|
 |--|--|--|--|--|--|
-| Logging | [Elasticsearch Exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter)| prometheus-community | prometheus-elasticsearch-exporter | 6.7.2 | prometheus-community/prometheus-elasticsearch-exporter-6.7.2.tgz |
-| Logging | [Fluent Bit](https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit)| fluent | fluent-bit | 0.49.0 | fluent/fluent-bit-0.49.0.tgz |
-| Logging | [OpenSearch](https://github.com/opensearch-project/helm-charts/tree/main/charts/opensearch)| opensearch | opensearch | 2.34.0 | opensearch/opensearch-2.34.0.tgz |
-| Logging | [OpenSearch Dashboards](https://github.com/opensearch-project/helm-charts/tree/main/charts/opensearch-dashboards)| opensearch | opensearch-dashboards | 2.30.0 | opensearch/opensearch-dashboards-2.30.0.tgz |
+| Logging | [Elasticsearch Exporter](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter)| prometheus-community | prometheus-elasticsearch-exporter | 7.0.0 | prometheus-community/prometheus-elasticsearch-exporter-7.0.0.tgz |
+| Logging | [Fluent Bit](https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit)| fluent | fluent-bit | 0.52.0 | fluent/fluent-bit-0.52.0.tgz |
+| Logging | [OpenSearch](https://github.com/opensearch-project/helm-charts/tree/main/charts/opensearch)| opensearch | opensearch | 2.35.0 | opensearch/opensearch-2.35.0.tgz |
+| Logging | [OpenSearch Dashboards](https://github.com/opensearch-project/helm-charts/tree/main/charts/opensearch-dashboards)| opensearch | opensearch-dashboards | 2.31.0 | opensearch/opensearch-dashboards-2.31.0.tgz |
 | Metrics | [Grafana (on OpenShift)](https://github.com/grafana/helm-charts/tree/main/charts/grafana)| grafana | grafana | 9.3.0 | grafana/grafana-9.3.0.tgz |
 | Metrics | [Kube Prometheus Stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)| prometheus-community | kube-prometheus-stack | 75.15.0 | prometheus-community/kube-prometheus-stack-75.15.0.tgz |
 | Metrics | [Prometheus Pushgateway](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-pushgateway)| prometheus-community | prometheus-pushgateway | 3.4.0 | prometheus-community/prometheus-pushgateway-3.4.0.tgz |
@@ -64,4 +64,4 @@ This table provides version information for some miscellaneous components deploy
 
 | Component | Version | Project Repository | Notes |
 |--|--|--|--|
-| OpenSearch Datasource Plugin (Grafana) | 2.28.0 | https://github.com/grafana/opensearch-datasource/releases |Allows Grafana to surface log messages stored in OpenSearch |
+| OpenSearch Datasource Plugin (Grafana) | 2.29.1 | https://github.com/grafana/opensearch-datasource/releases |Allows Grafana to surface log messages stored in OpenSearch |

CHANGELOG.md

@@ -2,6 +2,14 @@
 ## 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.
+  * [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)

bin/kube-include.sh

@@ -34,15 +34,15 @@ fi
 
 # SAS Viya 4 versions
 # supported by SAS Tech Support
-# Updated: 05AUG25
+# Updated: 05SEP25
 # 2023.10 LTS 1.25 1.27   (EOL: 1.26)
 # 2024.03 LTS 1.26 1.28   (EOL: 1.26)
 # 2024.09 LTS 1.28 1.30
 # 2025.03 LTS 1.29 1.31
-# 2025.04     1.29 1.31
 # 2025.05     1.30 1.32
 # 2025.06     1.30 1.32
 # 2025.07     1.30 1.32
+# 2025.08     1.30 1.32
 
 # Client version allowed to be one minor version earlier than minimum server version
 if [ "$KUBE_CLIENT_MAJOR" -eq "1" ] && [ "$KUBE_CLIENT_MINOR" -gt "24" ]; then

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

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

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