Skip to content

Commit db76ac5

Browse files
authored
Upgrade Metric Monitoring Stack amd Enable Grafana feature flag: prometheusSpecialCharsInLabelValues (#744)
1 parent d473778 commit db76ac5

File tree

3 files changed

+33
-16
lines changed

3 files changed

+33
-16
lines changed

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# SAS Viya Monitoring for Kubernetes
2-
## unreleased
2+
3+
## unreleased ##
4+
* **Metrics**
5+
* [UPGRADE] Kube-Prometheus Stack Helm chart has been upgraded from 68.3.0 to 70.8.0.
6+
* [UPGRADE] Grafana Helm Chart (for OpenShift deployments) has been upgraded from 8.8.4 to 8.13.1.
7+
* [UPGRADE] Prometheus Pushgateway Helm chart has been upgraded from 2.17.0 to 3.1.0.
8+
* [UPGRADE] The config-reloader has been upgraded from 0.79.2 to 0.81.0.
9+
* [UPGRADE] Grafana has been upgraded from 11.4.0 to 11.6.1.
10+
* [UPGRADE] The k8s-sidecar has been upgraded from 1.28.0 to 1.30.0.
11+
* [UPGRADE] Kube-State-Metrics has been upgraded from 2.14.0 to 2.15.0.
12+
* [UPGRADE] Node-Exporter has been upgraded from 1.8.2 to 1.9.1.
13+
* [UPGRADE] Prometheus has been upgraded from 3.1.0 to 3.2.1.
14+
* [UPGRADE] Prometheus Operator has been upgraded from 0.79.2 to 0.81.0.
15+
* [UPGRADE] Prometheus Pushgateway has been upgraded from 1.11.0 to 1.11.1.
16+
* [UPGRADE] OpenSearch Data Source Plugin to Grafana upgraded from 2.23.1 to 2.24.0
17+
* [UPGRADE] Admission Webhook upgraded from v1.5.1 to v1.5.2
318
* **Logging**
419
* [FIX] Resolved issue causing deploy_esexporter.sh to fail when doing an upgrade-in-place and serviceMonitor CRD is not installed.
520

component_versions.env

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,34 +37,34 @@ OSD_FULL_IMAGE="docker.io/opensearchproject/opensearch-dashboards:2.19.1"
3737
#Grafana (when deployed on OpenShift)
3838
OPENSHIFT_GRAFANA_CHART_REPO=grafana
3939
OPENSHIFT_GRAFANA_CHART_NAME=grafana
40-
OPENSHIFT_GRAFANA_CHART_VERSION=8.8.4
40+
OPENSHIFT_GRAFANA_CHART_VERSION=8.13.1
4141
OPENSHIFT_OAUTHPROXY_FULL_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:latest"
4242

4343
#Grafana (everywhere)
44-
GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:11.4.0"
45-
GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.28.0"
46-
GRAFANA_DATASOURCE_PLUGIN_VERSION="2.23.1"
44+
GRAFANA_FULL_IMAGE="docker.io/grafana/grafana:11.6.1"
45+
GRAFANA_SIDECAR_FULL_IMAGE="quay.io/kiwigrid/k8s-sidecar:1.30.0"
46+
GRAFANA_DATASOURCE_PLUGIN_VERSION="2.24.0"
4747

4848
#Kube-Prometheus Stack
4949
KUBE_PROM_STACK_CHART_REPO=prometheus-community
5050
KUBE_PROM_STACK_CHART_NAME=kube-prometheus-stack
51-
KUBE_PROM_STACK_CHART_VERSION=68.3.0
52-
ALERTMANAGER_FULL_IMAGE="quay.io/prometheus/alertmanager:v0.28.0"
53-
ADMWEBHOOK_FULL_IMAGE="registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6"
54-
KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.14.0"
55-
NODEXPORT_FULL_IMAGE="quay.io/prometheus/node-exporter:v1.8.2"
56-
PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v3.1.0"
57-
PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.79.2"
58-
CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.79.2"
51+
KUBE_PROM_STACK_CHART_VERSION=70.8.0
52+
ALERTMANAGER_FULL_IMAGE="quay.io/prometheus/alertmanager:v0.28.1"
53+
ADMWEBHOOK_FULL_IMAGE="registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.2"
54+
KSM_FULL_IMAGE="registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0"
55+
NODEXPORT_FULL_IMAGE="quay.io/prometheus/node-exporter:v1.9.1"
56+
PROMETHEUS_FULL_IMAGE="quay.io/prometheus/prometheus:v3.2.1"
57+
PROMOP_FULL_IMAGE="quay.io/prometheus-operator/prometheus-operator:v0.81.0"
58+
CONFIGRELOAD_FULL_IMAGE="quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0"
5959

6060
#Pushgateway
6161
PUSHGATEWAY_CHART_REPO=prometheus-community
6262
PUSHGATEWAY_CHART_NAME=prometheus-pushgateway
63-
PUSHGATEWAY_CHART_VERSION=2.17.0
64-
PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.0"
63+
PUSHGATEWAY_CHART_VERSION=3.1.0
64+
PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1"
6565

6666
#Prometheus Operator CRD
67-
PROM_OPERATOR_CRD_VERSION=v0.79.2
67+
PROM_OPERATOR_CRD_VERSION=v0.81.0
6868

6969
#Tempo
7070
TEMPO_CHART_REPO=grafana

monitoring/values-prom-operator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ grafana:
244244
format: json
245245
dashboards:
246246
default_home_dashboard_path: /tmp/dashboards/viya-welcome-dashboard.json
247+
feature_toggles:
248+
prometheusSpecialCharsInLabelValues: true
247249

248250
service:
249251
type: NodePort

0 commit comments

Comments
 (0)