From a1bfabbdf2d5611338c321cc2adfee8d2f586ad2 Mon Sep 17 00:00:00 2001
From: Greg Smith <65406958+gsmith-sas@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:36:33 -0400
Subject: [PATCH] [UPGRADE] Metric-monitoring components (#680)

---
 CHANGELOG.md           | 14 ++++++++++++++
 component_versions.env | 25 +++++++++++++------------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2852ad83..d8b5be74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # SAS Viya Monitoring for Kubernetes
 
+## Unreleased
+* **Metrics**
+  * [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.
diff --git a/component_versions.env b/component_versions.env
index 1bc66758..1bfad241 100644
--- a/component_versions.env
+++ b/component_versions.env
@@ -36,33 +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.17.4"
 
 #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