Merge pull request ceph#65855 from rhcs-dashboard/bump-monitoring-stack

mgr/cephadm: bump monitoring stack versions

Reviewed-by: Adam King <[email protected]>
Reviewed-by: Afreen Misbah <[email protected]>

Author: adk3798

src/pybind/mgr/dashboard/controllers/prometheus.py

@@ -15,6 +15,7 @@
 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 @@ def delete_silence(self, s_id):
 
     @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:

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')