Merge branch 'main' into osdatasource

.github/workflows/build-artifact/ARTIFACT_INVENTORY.template

@@ -6,7 +6,7 @@ The following tables provide information about the container images and Helm cha
 * deploy into an air-gapped Kubernetes cluster
 
 **Note:** For more information about deploying in an air-gapped environment, refer to 
-[Configure SAS Viya Monitoring for Kubernetes for an Air-Gapped Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n0grd8g2pkfglin12bzm3g1oik2p.htm).
+[Configure SAS Viya Monitoring for Kubernetes for an Air-Gapped Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n0auhd4hutsf7xn169hfvriysz4e.htm#n0grd8g2pkfglin12bzm3g1oik2p).
 
 ## Table 1. Container Images
 

ARTIFACT_INVENTORY.md

@@ -6,7 +6,7 @@ The following tables provide information about the container images and Helm cha
 * deploy into an air-gapped Kubernetes cluster
 
 **Note:** For more information about deploying in an air-gapped environment, refer to 
-[Configure SAS Viya Monitoring for Kubernetes for an Air-Gapped Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n0grd8g2pkfglin12bzm3g1oik2p.htm).
+[Configure SAS Viya Monitoring for Kubernetes for an Air-Gapped Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n0auhd4hutsf7xn169hfvriysz4e.htm#n0grd8g2pkfglin12bzm3g1oik2p).
 
 ## Table 1. Container Images
 
@@ -22,15 +22,15 @@ registry/repository/image_name:version
 | Logging | OpenSearch | docker.io/opensearchproject/opensearch:2.15.0 |
 | Logging | OpenSearch Dashboards| docker.io/opensearchproject/opensearch-dashboards:2.15.0 |
 | Metrics | Alertmanager | quay.io/prometheus/alertmanager:v0.27.0 |
-| Metrics | Grafana | docker.io/grafana/grafana:11.1.0 |
+| Metrics | Grafana | docker.io/grafana/grafana:11.2.0 |
 | Metrics | Admission Webhook | registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6 |
-| Metrics | Kube State Metrics | registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0 |
-| Metrics | Node Exporter | quay.io/prometheus/node-exporter:v1.8.1 |
-| Metrics | Prometheus | quay.io/prometheus/prometheus:v2.53.0 |
-| Metrics | Prometheus Operator | quay.io/prometheus-operator/prometheus-operator:v0.75.0 |
-| Metrics | Configuration Reloader (Alertmanager, Prometheus) | quay.io/prometheus-operator/prometheus-config-reloader:v0.75.0 |
-| Metrics | Prometheus Pushgateway | quay.io/prometheus/pushgateway:v1.8.0 |
-| Metrics | Auto-load Sidecars (Grafana) | quay.io/kiwigrid/k8s-sidecar:1.26.1 |
+| Metrics | Kube State Metrics | registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0 |
+| Metrics | Node Exporter | quay.io/prometheus/node-exporter:v1.8.2 |
+| Metrics | Prometheus | quay.io/prometheus/prometheus:v2.54.1 |
+| Metrics | Prometheus Operator | quay.io/prometheus-operator/prometheus-operator:v0.76.1 |
+| Metrics | Configuration Reloader (Alertmanager, Prometheus) | quay.io/prometheus-operator/prometheus-config-reloader:v0.76.1 |
+| Metrics | Prometheus Pushgateway | quay.io/prometheus/pushgateway:v1.9.0 |
+| Metrics | Auto-load Sidecars (Grafana) | quay.io/kiwigrid/k8s-sidecar:1.27.4 |
 | Metrics | OpenShift OAUTH Proxy (Grafana, OpenShift only) | registry.redhat.io/openshift4/ose-oauth-proxy:latest |
 | Metrics | Tempo | docker.io/grafana/tempo:2.4.1 |
 
@@ -54,7 +54,7 @@ This table identifies the Helm charts used by SAS Viya Monitoring for Kubernetes
 | Logging | Fluent Bit| fluent | fluent-bit | 0.47.2 | fluent/fluent-bit-0.47.2.tgz |
 | Logging | OpenSearch| opensearch | opensearch | 2.21.0 | opensearch/opensearch-2.21.0.tgz |
 | Logging | OpenSearch Dashboard| opensearch | opensearch-dashboards | 2.19.0 | opensearch/opensearch-dashboards-2.19.0.tgz |
-| Metrics | Grafana (on OpenShift)| grafana | grafana | 8.2.1 | grafana/grafana-8.2.1.tgz |
-| Metrics | Kube Prometheus Stack| prometheus-community | kube-prometheus-stack | 61.1.1 | prometheus-community/kube-prometheus-stack-61.1.1.tgz |
-| Metrics | Prometheus Pushgateway| prometheus-community | prometheus-pushgateway | 2.13.0 | prometheus-community/prometheus-pushgateway-2.13.0.tgz |
+| Metrics | Grafana (on OpenShift)| grafana | grafana | 8.5.1 | grafana/grafana-8.5.1.tgz |
+| Metrics | Kube Prometheus Stack| prometheus-community | kube-prometheus-stack | 62.7.0 | prometheus-community/kube-prometheus-stack-62.7.0.tgz |
+| Metrics | Prometheus Pushgateway| prometheus-community | prometheus-pushgateway | 2.14.0 | prometheus-community/prometheus-pushgateway-2.14.0.tgz |
 | Metrics | Tempo | grafana | tempo | 1.7.2 | grafana/tempo-1.7.2.tgz |

CHANGELOG.md

@@ -5,6 +5,32 @@
   * [CHANGE] The `create_logging_datasource.sh` script now uses the OpenSearch datasource plugin
 rather the Elasticsearch datasource plugin when creating the **ViyaLogs** datasource in Grafana.
 The plugin is downloaded and installed if it is not already in place.
+  * [UPGRADE] Kube-Prometheus Stack Helm chart has been upgraded from 61.1.1 to 62.7.0.
+  * [UPGRADE] Grafana Helm Chart (for OpenShift deployments) has been upgraded from 8.2.1 to 8.5.1.
+  * [UPGRADE] Prometheus Pushgateway Helm chart has been upgraded from 2.13.0 to 2.14.0.
+  * [UPGRADE] The config-reloader has been upgraded from 0.75.0 to 0.76.1.
+  * [UPGRADE] Grafana has been upgraded from 11.1.0 to 11.2.0.
+  * [UPGRADE] The k8s-sidecar has been upgraded from 1.26.1 to 1.27.4.
+  * [UPGRADE] Kube-State-Metrics has been upgraded from 2.12.0 to 2.13.0.
+  * [UPGRADE] Node-Exporter has been upgraded from 1.8.1 to 1.8.2.
+  * [UPGRADE] Prometheus has been upgraded from 2.53.0 to 2.54.1.
+  * [UPGRADE] Prometheus Operator has been upgraded from 0.75.0 to 0.76.1.
+  * [UPGRADE] Prometheus Pushgateway has been upgraded from 1.8.0 to 1.9.0.
+
+## Version 1.2.29 (16SEP2024)
+* **Overall**
+  * [DOCUMENTATION] Reorganization of content to improve readability and flow.
+  * [TASK] Updated links (within markdown files, dashboards, etc.) to reflect documentation reorganization
+
+* **Logging**
+  * [CHANGE] Updated link to SAS documentation in the SAS Update Checker Report (within 
+OpenSearch Dashboards) to be version-independent
+
+* **Metrics**
+  * [FIX] Changed metric label (from 'CAS Version' to 'OS Version') on SAS CAS Overview 
+dashboard (within Grafana) to reflect information displayed
+  * [FIX] Replace deprecated `oc serviceacounts get-token` command in deploy_monitoring_openshift.sh for OpenShift 4.16+
+
 
 
 ## Version 1.2.28 (13AUG2024)

Cloud_Providers.md

@@ -1,3 +1,3 @@
 # Cloud Providers
 
-See [Monitoring and Logging on Cloud-Provider Platforms](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n0lzjee544jib9n1dj4wc0fhuc36.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Monitoring and Logging on Cloud-Provider Platforms](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n0lzjee544jib9n1dj4wc0fhuc36.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

README.md

@@ -13,10 +13,6 @@ Log monitoring and metric monitoring can be deployed independently or together.
 
 For information about SAS® Viya® Monitoring for Kubernetes, see the following sections in the SAS Viya Monitoring for Kubernetes Help Center:
 
-- For an introduction, see [About SAS® Viya® Monitoring for Kubernetes](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n0bzfdp3bn6p4vn1lj9pm2hy8t0q.htm).
+- For an introduction, see [About SAS® Viya® Monitoring for Kubernetes](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n0bzfdp3bn6p4vn1lj9pm2hy8t0q.htm).
 
-- For information about the application components deployed by SAS® Viya® Monitoring for Kubernetes, the prerequisites, and more, see [Getting Started](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n18d875xbudfken18v75gj7mopxq.htm).
-
-- For information about pre-deployment and customization, see [Pre-deployment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1ajbblsxpcgl5n11t13wgtd4d7c.htm).
-
-- For information about deployment, see [Deploy](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1rhzwx0mcnnnun17q11v85bspyk.htm).
+- For information about the components in SAS® Viya® Monitoring for Kubernetes, the prerequisites, and more, see [Getting Started](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n18d875xbudfken18v75gj7mopxq.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

bin/kube-include.sh

@@ -34,26 +34,26 @@ fi;
 
 # SAS Viya 4 versions
 # supported by SAS Tech Support
-# Updated: 26AUG24
-# 2022.09 LTS 1.21 1.24  (EOL: 1.21, 1.22)
+# Updated: 27SEP24
+# 2022.09 LTS 1.21 1.24  (EOL: 1.21, 1.22, 1.23)
 # 2023.03 LTS 1.23 1.25
 # 2023.10 LTS 1.25 1.27
 # 2024.03 LTS 1.26 1.28
-# 2024.05     1.27 1.29
 # 2024.06     1.27 1.29
 # 2024.07     1.27 1.29
 # 2024.08     1.27 1.29
+# 2024.09     1.28 1.30
 
 
 # Client version allowed to be one minor version earlier than minimum server version
-if [ "$KUBE_CLIENT_MAJOR" -eq "1" ] && [ "$KUBE_CLIENT_MINOR" -gt "21" ]; then
+if [ "$KUBE_CLIENT_MAJOR" -eq "1" ] && [ "$KUBE_CLIENT_MINOR" -gt "22" ]; then
   :
 else
   log_warn "Unsupported kubectl version: [$KUBE_CLIENT_VER]."
   log_warn "This script might not work as expected. Support might not be available until kubectl is upgraded to a supported version."
 fi
 
-if [ "$KUBE_SERVER_MAJOR" -eq "1" ] && [ "$KUBE_SERVER_MINOR" -gt "22"  ]; then
+if [ "$KUBE_SERVER_MAJOR" -eq "1" ] && [ "$KUBE_SERVER_MINOR" -gt "23"  ]; then
   :
 else
   log_warn "The detected version of Kubernetes [$KUBE_SERVER_VER] is not supported by any of the currently supported releases of SAS Viya."

component_versions.env

@@ -36,34 +36,34 @@ OSD_FULL_IMAGE="docker.io/opensearchproject/opensearch-dashboards:2.15.0"
 #Grafana (when deployed on OpenShift)
 OPENSHIFT_GRAFANA_CHART_REPO=grafana
 OPENSHIFT_GRAFANA_CHART_NAME=grafana
-OPENSHIFT_GRAFANA_CHART_VERSION=8.2.1
+OPENSHIFT_GRAFANA_CHART_VERSION=8.5.1
 OPENSHIFT_OAUTHPROXY_FULL_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:latest"
 
 #Grafana (everywhere)
-GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:11.1.0"
-GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.26.1"
+GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:11.2.0"
+GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.27.4"
 GRAFANA_DATASOURCE_PLUGIN_VERSION="2.18.0"
 
 #Kube-Prometheus Stack
 KUBE_PROM_STACK_CHART_REPO=prometheus-community
 KUBE_PROM_STACK_CHART_NAME=kube-prometheus-stack
-KUBE_PROM_STACK_CHART_VERSION=61.1.1
+KUBE_PROM_STACK_CHART_VERSION=62.7.0
 ALERTMANAGER_FULL_IMAGE="quay.io/prometheus/alertmanager:v0.27.0"
 ADMWEBHOOK_FULL_IMAGE="registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6"
-KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0"
-NODEXPORT_FULL_IMAGE="quay.io/prometheus/node-exporter:v1.8.1"
-PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v2.53.0"
-PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.75.0"
-CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.75.0" 
+KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0"
+NODEXPORT_FULL_IMAGE="quay.io/prometheus/node-exporter:v1.8.2"
+PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v2.54.1"
+PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.76.1"
+CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.76.1" 
 
 #Pushgateway
 PUSHGATEWAY_CHART_REPO=prometheus-community
 PUSHGATEWAY_CHART_NAME=prometheus-pushgateway
-PUSHGATEWAY_CHART_VERSION=2.13.0
-PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.8.0"
+PUSHGATEWAY_CHART_VERSION=2.14.0
+PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.9.0"
 
 #Prometheus Operator CRD
-PROM_OPERATOR_CRD_VERSION=v0.75.0
+PROM_OPERATOR_CRD_VERSION=v0.76.1
 
 #Tempo
 TEMPO_CHART_REPO=grafana

logging/Differences_between_ODFE_and_OpenSearch.md

@@ -55,7 +55,7 @@ When this option is set, OpenSearch Dashboards is accessible on the same port (3
 
 **Note:** As of release 1.2.1, if you do not set the environment variable `KB_KNOWN_NODEPORT_ENABLE` to `true` before running the `logging/bin/deploy_logging.sh` script, you can now use the `configure_nodeport.sh` 
 script after deployment.
-See [Configure Access to OpenSearch](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n0l4k3bz39cw2dn131zcbat7m4r1.htm).
+See [Configure Access to OpenSearch](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n0l4k3bz39cw2dn131zcbat7m4r1.htm).
 
 ### Migrate an Existing Deployment
 

logging/Export_Logs.md

@@ -1,3 +1,3 @@
 # Export Logs
 
-See [How To Export Logs (getlogs.py)](https://documentation.sas.com/?docsetId=obsrvdply&docsetVersion=latest&docsetTarget=p1wdkgnu7dp791n1h9xfyh68ltnt.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Exporting Logs with getlogs.py](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvug&docsetTarget=p1wdkgnu7dp791n1h9xfyh68ltnt.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/Limiting_Access_to_Logs.md

@@ -1 +1 @@
-See [Controlling User Access to Log Monitoring](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=p1nee94eh0x1ymn1blz03g48jz2y.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Control User Access to Log Monitoring](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=p1nee94eh0x1ymn1blz03g48jz2y.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/Log_Retention.md

@@ -1 +1 @@
-See [Adjust the Retention Period for Log Messages](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1dwvmcsjvmw61n0zyiasrfae2yh.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Adjust the Retention Period for Log Messages](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n1dwvmcsjvmw61n0zyiasrfae2yh.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/Logging_Security.md

@@ -1 +1 @@
-See [Controlling User Access to Log Monitoring](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=p1nee94eh0x1ymn1blz03g48jz2y.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Control User Access to Log Monitoring](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=p1nee94eh0x1ymn1blz03g48jz2y.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/Notes_on_using_TLS.md

@@ -1 +1 @@
-See [Understanding How Transport Layer Security (TLS) Is Used by SAS Viya Monitoring for Kubernetes](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=p0ssqw32dy9a44n1rokwojskla19.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Transport Layer Security (TLS): Digital Certificates and Kubernetes Secrets](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=p1tedn8lzgvhlyn1bzwgvqvv3p4j.htm#n1pnll5qjcigjvn15shfdhdhr0lz) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/OpenShift.md

@@ -1,3 +1,3 @@
 # SAS Viya Log-monitoring on Red Hat OpenShift
 
-See [Monitoring on Red Hat OpenShift](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1o8xyp2vatupan1nhgknbzhp7tm.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Red Hat OpenShift Considerations](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n1rn2homfb6tken17qkyrrx9bk8w.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/README.md

@@ -1,11 +1,6 @@
 # Logging
 
-See the following topics in the SAS Viya Monitoring for Kubernetes Help Center:
-
-* [Getting Started](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n18d875xbudfken18v75gj7mopxq.htm)
-* [Pre-deployment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1ajbblsxpcgl5n11t13wgtd4d7c.htm)
-* [Deploy](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n1rhzwx0mcnnnun17q11v85bspyk.htm)
-* [Modify the Deployment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n08465wdbmux9cn1iz6dk2bzdcw4.htm) 
+To learn how to deploy the logging component, see [Getting Started](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n18d875xbudfken18v75gj7mopxq.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
 
 ## Important Information about OpenSearch and OpenSearch Dashboards
 

logging/Tenant_Logging.md

@@ -1,3 +1,3 @@
 # Implementing Access Limitations for Logging for Tenants
 
-See [Limit Access in a Multi-Tenant Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=n12rumatqso1ivn1v4qg4932ajn2.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Limit Access in a Multi-Tenant Environment](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=n12rumatqso1ivn1v4qg4932ajn2.htm) in the SAS Viya Monitoring for Kubernetes Help Center.

logging/Troubleshooting.md

@@ -1,3 +1,3 @@
 # Troubleshooting
 
-See [Troubleshooting](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=default&docsetId=obsrvdply&docsetTarget=p1f3c5so49c0fyn1hrdplosqc6l1.htm) in the SAS Viya Monitoring for Kubernetes Help Center.
+See [Troubleshooting](https://documentation.sas.com/?cdcId=obsrvcdc&cdcVersion=v_003&docsetId=obsrvdply&docsetTarget=p1f3c5so49c0fyn1hrdplosqc6l1.htm) in the SAS Viya Monitoring for Kubernetes Help Center.