Merge branch 'main' into ospreq

Author: gsmith-sas

ARTIFACT_INVENTORY.md

@@ -22,15 +22,15 @@ registry/repository/image_name:version
 | 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 |
-| Metrics | [Kube State Metrics](https://github.com/kubernetes/kube-state-metrics) | registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0 |
+| Metrics | [Grafana](https://github.com/grafana/grafana) | docker.io/grafana/grafana:12.2.0 |
+| Metrics | [Admission Webhook](https://github.com/kubernetes/ingress-nginx) | registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.3 |
+| Metrics | [Kube State Metrics](https://github.com/kubernetes/kube-state-metrics) | registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0 |
 | Metrics | [Node Exporter](https://github.com/prometheus/node_exporter) | quay.io/prometheus/node-exporter:v1.9.1 |
-| Metrics | [Prometheus](https://github.com/prometheus/prometheus) | quay.io/prometheus/prometheus:v3.5.0 |
-| Metrics | [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) | quay.io/prometheus-operator/prometheus-operator:v0.83.0 |
-| Metrics | [Configuration Reloader](https://github.com/prometheus-operator/prometheus-operator/tree/main/cmd/prometheus-config-reloader) | quay.io/prometheus-operator/prometheus-config-reloader:v0.83.0 |
+| Metrics | [Prometheus](https://github.com/prometheus/prometheus) | quay.io/prometheus/prometheus:v3.7.1 |
+| Metrics | [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) | quay.io/prometheus-operator/prometheus-operator:v0.86.1 |
+| Metrics | [Configuration Reloader](https://github.com/prometheus-operator/prometheus-operator/tree/main/cmd/prometheus-config-reloader) | quay.io/prometheus-operator/prometheus-config-reloader:v0.86.1 |
 | Metrics | [Prometheus Pushgateway](https://github.com/prometheus/pushgateway) | quay.io/prometheus/pushgateway:v1.11.1 |
-| Metrics | [Auto-load Sidecars](https://github.com/kiwigrid/k8s-sidecar) | quay.io/kiwigrid/k8s-sidecar:1.30.3 |
+| Metrics | [Auto-load Sidecars](https://github.com/kiwigrid/k8s-sidecar) | quay.io/kiwigrid/k8s-sidecar:1.30.9 |
 | Metrics | OpenShift OAUTH Proxy (Grafana, OpenShift only) | registry.redhat.io/openshift4/ose-oauth-proxy:latest |
 | Metrics | [Tempo](https://github.com/grafana/tempo) | docker.io/grafana/tempo:2.7.0 |
 
@@ -54,14 +54,14 @@ This table identifies the Helm charts used by SAS Viya Monitoring for Kubernetes
 | 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 |
+| Metrics | [Grafana (on OpenShift)](https://github.com/grafana/helm-charts/tree/main/charts/grafana)| grafana | grafana | 9.4.5 | grafana/grafana-9.4.5.tgz |
+| Metrics | [Kube Prometheus Stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)| prometheus-community | kube-prometheus-stack | 78.4.0 | prometheus-community/kube-prometheus-stack-78.4.0.tgz |
+| Metrics | [Prometheus Pushgateway](https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-pushgateway)| prometheus-community | prometheus-pushgateway | 3.4.1 | prometheus-community/prometheus-pushgateway-3.4.1.tgz |
 | Metrics | [Tempo](https://github.com/grafana/helm-charts/tree/main/charts/tempo)| grafana | tempo | 1.18.1 | grafana/tempo-1.18.1.tgz |
 
 ## Table 4. Miscellaneous Component Version Information
 This table provides version information for some miscellaneous components deployed by SAS Viya Monitoring for Kubernetes.
 
 | Component | Version | Project Repository | Notes |
 |--|--|--|--|
-| OpenSearch Datasource Plugin (Grafana) | 2.29.1 | https://github.com/grafana/opensearch-datasource/releases |Allows Grafana to surface log messages stored in OpenSearch |
+| OpenSearch Datasource Plugin (Grafana) | 2.31.1 | https://github.com/grafana/opensearch-datasource/releases |Allows Grafana to surface log messages stored in OpenSearch |

CHANGELOG.md

@@ -1,8 +1,21 @@
 # SAS Viya Monitoring for Kubernetes
-## Unreleased
+## **Unreleased**
+* **Metrics**
+  * [UPGRADE] Kube-Prometheus Stack Helm chart has been upgraded from 75.15.0 to 78.4.0
+  * [UPGRADE] Grafana Helm Chart (for OpenShift deployments) has been upgraded fom 9.3.0 to 9.4.5.
+  * [UPGRADE] Prometheus Pushgateway Helm chart has been upgraded from 3.4.0 to 3.4.1.
+  * [UPGRADE] The config-reloader has been upgraded from 0.83.0 to 0.86.1.
+  * [UPGRADE] Grafana has been upgraded from 12.1.0 to 12.2.0.
+  * [UPGRADE] The k8s-sidecar has been upgraded from 1.30.3 to 1.30.9.
+  * [UPGRADE] Kube-State-Metrics has been upgraded from 2.16.0 to 2.17.0.
+  * [UPGRADE] Prometheus has been upgraded from 3.5.0 to 3.7.1.
+  * [UPGRADE] Prometheus Operator has been upgraded from 0.83.0 to 0.86.1.
+  * [UPGRADE] OpenSearch Data Source Plugin to Grafana upgraded from 2.29.1 to 2.31.1
 * **Logging**
+  * [FIX] Log messages from Alertmanger pod redirected to OpenSearch viya_ops-* (rather than viya_logs-*) index
   * [CHANGE] All OpenShift-specific scripts now fail when run on non-OpenShift clusters
 
+
 ## Version 1.2.43 (10OCT2025)
 * **Metrics**
   * [FEATURE] A new sample demonstrates how to extend SAS Viya Monitoring

component_versions.env

@@ -37,30 +37,30 @@ OSD_FULL_IMAGE="docker.io/opensearchproject/opensearch-dashboards:2.19.3"
 #Grafana (when deployed on OpenShift)
 OPENSHIFT_GRAFANA_CHART_REPO=grafana
 OPENSHIFT_GRAFANA_CHART_NAME=grafana
-OPENSHIFT_GRAFANA_CHART_VERSION=9.3.0
+OPENSHIFT_GRAFANA_CHART_VERSION=9.4.5
 OPENSHIFT_OAUTHPROXY_FULL_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:latest"
 
 #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.29.1"
+GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:12.2.0"
+GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.30.9"
+GRAFANA_DATASOURCE_PLUGIN_VERSION="2.31.1"
 
 #Kube-Prometheus Stack
 KUBE_PROM_STACK_CHART_REPO=prometheus-community
 KUBE_PROM_STACK_CHART_NAME=kube-prometheus-stack
-KUBE_PROM_STACK_CHART_VERSION=75.15.0
+KUBE_PROM_STACK_CHART_VERSION=78.4.0
 ALERTMANAGER_FULL_IMAGE="quay.io/prometheus/alertmanager:v0.28.1"
-ADMWEBHOOK_FULL_IMAGE="registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0"
-KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0"
+ADMWEBHOOK_FULL_IMAGE="registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.3"
+KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0"
 NODEXPORT_FULL_IMAGE="quay.io/prometheus/node-exporter:v1.9.1"
-PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v3.5.0"
-PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.83.0"
-CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.83.0"
+PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v3.7.1"
+PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.86.1"
+CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.86.1"
 
 #Pushgateway
 PUSHGATEWAY_CHART_REPO=prometheus-community
 PUSHGATEWAY_CHART_NAME=prometheus-pushgateway
-PUSHGATEWAY_CHART_VERSION=3.4.0
+PUSHGATEWAY_CHART_VERSION=3.4.1
 PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1"
 
 #Prometheus Operator CRD

logging/fb/fluent-bit_config.configmap_azmonitor.yaml

@@ -6,7 +6,7 @@ data:
     [FILTER]
        Name modify
        Match *
-       Set  fb_configMap_version 0.2.28
+       Set  fb_configMap_version 0.2.29.1dev
        #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, /var/log/containers/prometheus-v4m-*.log
+       Exclude_Path     /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log, /var/log/containers/alertmanager-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, /var/log/containers/prometheus-v4m-*.log
+       Path             /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log, /var/log/containers/alertmanager-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.28
+       Set  fb_configMap_version 0.2.29.1dev
        #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, /var/log/containers/prometheus-v4m-*.log
+       Exclude_Path     /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log, /var/log/containers/alertmanager-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, /var/log/containers/prometheus-v4m-*.log
+       Path             /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log, /var/log/containers/alertmanager-v4m-*.log
        Parser           ${KUBERNETES_RUNTIME_LOGFMT}
        Tag              opsK.*
        Refresh_Interval    5

samples/speedystore/README.md

@@ -83,9 +83,9 @@ In this example, the SingleStore Master node (pod) IP address will be used for t
 By default, the `sdb-admin start-monitoring-kube` command displays some information and asks the user if they would like to continue.  To skip this prompt and have the configuration continue automatically, this example includes the `--yes` parameter.
 
 #### Accessing the Kubernetess Cluster
-The `sb-admin` command needs to access the Kubernetes cluster on which SAS Viya and SingleStore are running.  It does this through a Kubernetes configuration file.  By default, the command uses the file identified in the `KUBECONFIG` environment variable (if defined), or the `~/.kube/config` file (if it exists) to discover the cluster. Alternatively, the `--config-file` option can be used to specify the kube config file to use.
+The `sdb-admin` command needs to access the Kubernetes cluster on which SAS Viya and SingleStore are running.  It does this through a Kubernetes configuration file.  By default, the command uses the file identified in the `KUBECONFIG` environment variable (if defined), or the `~/.kube/config` file (if it exists) to discover the cluster. Alternatively, the `--config-file` option can be used to specify the kube config file to use.
 
-#### Run the `sb-admin start-monitoring-kube` command
+#### Run the `sdb-admin start-monitoring-kube` command
 After setting all of the required parameters, submit the following command to configure and start the monitoring, including the metrics database:
 
 `sdb-admin start-monitoring-kube --cluster-name sas-singlestore-cluster --namespace $VIYA_NS --user root --password $ROOT_PWD --exporter-host $CLUSTER_MASTER_IP --yes`