mgr/cephadm: bump monitoring stack versions

bumping prometheus, node-exporter, alertmanager, grafana.

Fixes: https://tracker.ceph.com/issues/73467
Signed-off-by: Nizamudeen A <nia@redhat.com>

diff --git a/src/pybind/mgr/dashboard/controllers/prometheus.py b/src/pybind/mgr/dashboard/controllers/prometheus.py
index 244106d470d53434064832862e4feeebaead974b..eeb8066b3d204acb89c7d0553838e0bddc149c05 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/prometheus.py
+++ b/src/pybind/mgr/dashboard/controllers/prometheus.py
@@ -15,6 +15,7 @@ from ..services import ceph_service
 from ..services.orchestrator import OrchClient
 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
 
 
@@ -242,7 +243,7 @@ class Prometheus(PrometheusRESTController):
 
     @RESTController.Collection(method='GET', path='/alertgroup')
     def get_alertgroup(self, cluster_filter=False, **params):
-        if cluster_filter:
+        if str_to_bool(cluster_filter):
             try:
                 fsid = mgr.get('config')['fsid']
             except KeyError:

diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py
index 43e377e405d5e720d1f01b8f8402e65b2850afa7..4b66ebc3b34981e45f01bc2a64b0d4117acb6cb6 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -25,18 +25,18 @@ def _create_image(image_ref: str, key: str) -> ContainerImage:
 
 class DefaultImages(Enum):
     PROMETHEUS = _create_image(
-        'quay.io/prometheus/prometheus:v2.51.0', 'prometheus'
+        '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')
     ALLOY = _create_image('docker.io/grafana/alloy:latest', 'alloy')
     NODE_EXPORTER = _create_image(
-        'quay.io/prometheus/node-exporter:v1.7.0', 'node_exporter'
+        'quay.io/prometheus/node-exporter:v1.9.1', 'node_exporter'
     )
     ALERTMANAGER = _create_image(
-        'quay.io/prometheus/alertmanager:v0.27.0', 'alertmanager'
+        'quay.io/prometheus/alertmanager:v0.28.1', 'alertmanager'
     )
-    GRAFANA = _create_image('quay.io/ceph/grafana:11.6.0', 'grafana')
+    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')