Merge pull request ceph#56331 from rhcs-dashboard/update-mon-stacks

mgr/cephadm: bump monitoring stacks versions

Author: nizamial09

src/cephadm/cephadmlib/constants.py

@@ -4,12 +4,12 @@
 DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
 DEFAULT_IMAGE_IS_MAIN = True
 DEFAULT_IMAGE_RELEASE = 'squid'
-DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
+DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.51.0'
 DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0'
 DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0'
-DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
-DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
-DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12'
+DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.7.0'
+DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.27.0'
+DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0'
 DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
 DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.1'

src/pybind/mgr/cephadm/module.py

@@ -128,13 +128,13 @@ def os_exit_noop(status: int) -> None:
 
 # Default container images -----------------------------------------------------
 DEFAULT_IMAGE = 'quay.io/ceph/ceph'
-DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
-DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
+DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.51.0'
+DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.7.0'
 DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.5'
 DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0'
 DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0'
-DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
-DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12'
+DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.27.0'
+DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0'
 DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
 DEFAULT_SNMP_GATEWAY_IMAGE = 'docker.io/maxwo/snmp-notifier:v1.2.1'

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/grafana.feature.po.ts

@@ -6,13 +6,15 @@ function getIframe() {
   return cy.iframe();
 }
 
+const WAIT_TO_LOAD = 1000;
+
 Then('I should see the grafana panel {string}', (panels: string) => {
   getIframe().within(() => {
     for (const panel of panels.split(', ')) {
       cy.get('.grafana-app')
-        .wait(100)
+        .wait(WAIT_TO_LOAD)
         .within(() => {
-          cy.get(`[aria-label="${panel} panel"]`).should('be.visible');
+          cy.get(`[title="${panel}"]`).should('be.visible');
         });
     }
   });
@@ -22,13 +24,13 @@ When('I view the grafana panel {string}', (panels: string) => {
   getIframe().within(() => {
     for (const panel of panels.split(', ')) {
       cy.get('.grafana-app')
-        .wait(100)
+        .wait(WAIT_TO_LOAD)
         .within(() => {
-          cy.get(`[aria-label="${panel} panel"]`).within(() => {
-            cy.get('h2').click();
-          });
-          cy.get('[aria-label="Panel header item View"]').click();
+          cy.get(`[data-testid="data-testid Panel header ${panel}"]`).click();
+          cy.get(`[aria-label="Menu for panel with title ${panel}"]`).click();
         });
+
+      cy.get('[data-testid="data-testid Panel menu item View"]').click();
     }
   });
 });
@@ -37,9 +39,9 @@ Then('I should not see {string} in the panel {string}', (value: string, panels:
   getIframe().within(() => {
     for (const panel of panels.split(', ')) {
       cy.get('.grafana-app')
-        .wait(100)
+        .wait(WAIT_TO_LOAD)
         .within(() => {
-          cy.get(`[aria-label="${panel} panel"]`)
+          cy.get(`[data-testid="data-testid Panel header ${panel}"]`)
             .should('be.visible')
             .within(() => {
               cy.get('span').first().should('not.have.text', value);
@@ -55,9 +57,9 @@ Then(
     getIframe().within(() => {
       for (const panel of panels.split(', ')) {
         cy.get('.grafana-app')
-          .wait(100)
+          .wait(WAIT_TO_LOAD)
           .within(() => {
-            cy.get(`[aria-label="${panel} panel"]`)
+            cy.get(`[data-testid="data-testid Panel header ${panel}"]`)
               .should('be.visible')
               .within(() => {
                 for (const legend of legends.split(', ')) {
@@ -74,9 +76,9 @@ Then('I should not see No Data in the graph {string}', (panels: string) => {
   getIframe().within(() => {
     for (const panel of panels.split(', ')) {
       cy.get('.grafana-app')
-        .wait(100)
+        .wait(WAIT_TO_LOAD)
         .within(() => {
-          cy.get(`[aria-label="${panel} panel"]`)
+          cy.get(`[data-testid="data-testid Panel header ${panel}"]`)
             .should('be.visible')
             .within(() => {
               cy.get('div.datapoints-warning').should('not.exist');