From 256a130a2c260cb8e6f499a81852c02327e21032 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Thu, 9 Oct 2025 14:42:03 +0530 Subject: [PATCH] mgr/cephadm: bump monitoring stack versions bumping prometheus, node-exporter, alertmanager, grafana. Fixes: https://tracker.ceph.com/issues/73467 Signed-off-by: Nizamudeen A (cherry picked from commit c44ad21b1f615edd2a676928d44391313db571f9) Conflict: src/python-common/ceph/cephadm/images.py (cherry picked from commit bf1e40e580e54904f27e12ff7f4e11fd1c547495) --- src/pybind/mgr/dashboard/controllers/prometheus.py | 1 + src/python-common/ceph/cephadm/images.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/prometheus.py b/src/pybind/mgr/dashboard/controllers/prometheus.py index c00d8c70e63..8d744a7ed7d 100644 --- a/src/pybind/mgr/dashboard/controllers/prometheus.py +++ b/src/pybind/mgr/dashboard/controllers/prometheus.py @@ -12,6 +12,7 @@ from ..security import Scope from ..services import ceph_service from ..services.settings import SettingsService from ..settings import Options, Settings +from ..tools import str_to_bool from . import APIDoc, APIRouter, BaseController, Endpoint, RESTController, Router, UIRouter diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py index a5a6c5f35ca..13934a49f10 100644 --- a/src/python-common/ceph/cephadm/images.py +++ b/src/python-common/ceph/cephadm/images.py @@ -24,12 +24,12 @@ def _create_image(image_ref: str, key: str) -> ContainerImage: class DefaultImages(Enum): - PROMETHEUS = _create_image('quay.io/prometheus/prometheus:v2.51.0', 'prometheus') + PROMETHEUS = _create_image('quay.io/prometheus/prometheus:v3.6.0', 'prometheus') LOKI = _create_image('docker.io/grafana/loki:3.0.0', 'loki') PROMTAIL = _create_image('docker.io/grafana/promtail:3.0.0', 'promtail') - NODE_EXPORTER = _create_image('quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter') - ALERTMANAGER = _create_image('quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager') - GRAFANA = _create_image('quay.io/ceph/grafana:11.6.0', 'grafana') + NODE_EXPORTER = _create_image('quay.io/prometheus/node-exporter:v1.9.1', 'node_exporter') + ALERTMANAGER = _create_image('quay.io/prometheus/alertmanager:v0.28.1', 'alertmanager') + GRAFANA = _create_image('quay.io/ceph/grafana:12.2.0', 'grafana') HAPROXY = _create_image('quay.io/ceph/haproxy:2.3', 'haproxy') KEEPALIVED = _create_image('quay.io/ceph/keepalived:2.2.4', 'keepalived') NVMEOF = _create_image('quay.io/ceph/nvmeof:1.5', 'nvmeof') -- 2.39.5