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>
(cherry picked from commit c44ad21b1f615edd2a676928d44391313db571f9)

Conflict:
    src/python-common/ceph/cephadm/images.py

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 a5a6c5f35ca89f0798e9a662a4a3491b67cb74eb..13934a49f10bf734f73be7b4bd54f6db463799e4 100644 (file)
--- 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')