mgr/dashboard: fix the cephadm grafana e2e failure

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

diff --git a/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh b/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh
index e416de1b1337d84810fcc0e8d3a07da74bcc8df7..d688a3c304028d4b99658176cc3b16f765ec20cd 100755 (executable)
--- a/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh
@@ -55,5 +55,5 @@ kcli ssh -u root ceph-node-00 'cephadm shell "ceph orch apply node-exporter --pl
 
 kcli ssh -u root ceph-node-00 'cephadm shell "ceph config set mgr mgr/prometheus/exclude_perf_counters false"'
 
-cypress_run ["cypress/e2e/orchestrator/workflow/*.feature, cypress/e2e/orchestrator/workflow/*-spec.ts"]
+cypress_run ["cypress/e2e/orchestrator/workflow/*.feature","cypress/e2e/orchestrator/workflow/*-spec.ts"]
 cypress_run "cypress/e2e/orchestrator/grafana/*.feature"

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/grafana.feature.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/grafana.feature.po.ts
index 4b2ee4d00437e1be8f099c0ec273baf23324bc94..edd0e9b56322fdb33e0e02796cd2de11d0905b72 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/grafana.feature.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/grafana.feature.po.ts
@@ -61,7 +61,7 @@ Then(
               .should('be.visible')
               .within(() => {
                 for (const legend of legends.split(', ')) {
-                  cy.get('a').contains(legend);
+                  cy.get(`button`).contains(legend);
                 }
               });
           });

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/grafana/grafana.feature b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/grafana/grafana.feature
index 62476ad25a4bf1f34e4f27e352dee7c78e06cb73..fc023712ec2a15844a53b22e579267b38589a80c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/grafana/grafana.feature
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/grafana/grafana.feature
@@ -38,7 +38,7 @@ Feature: Grafana panels
             | GET Latencies by RGW Instance | foo.ceph-node-00, foo.ceph-node-01, foo.ceph-node-02 |
             | Bandwidth by RGW Instance | foo.ceph-node-00, foo.ceph-node-01, foo.ceph-node-02 |
             | PUT Latencies by RGW Instance | foo.ceph-node-00, foo.ceph-node-01, foo.ceph-node-02 |
-            | Average GET/PUT Latencies | GET AVG, PUT AVG |
+            | Average GET/PUT Latencies by RGW Instance | GET, PUT |
             | Bandwidth Consumed by Type | GETs, PUTs |
 
     Scenario Outline: RGW per Daemon Performance
@@ -54,10 +54,7 @@ Feature: Grafana panels
             | name | panel |
             | foo.ceph-node-00 | Bandwidth by HTTP Operation |
             | foo.ceph-node-00 | HTTP Request Breakdown |
-            | foo.ceph-node-00 | Workload Breakdown |
             | foo.ceph-node-01 | Bandwidth by HTTP Operation |
             | foo.ceph-node-01 | HTTP Request Breakdown |
-            | foo.ceph-node-01 | Workload Breakdown |
             | foo.ceph-node-02 | Bandwidth by HTTP Operation |
             | foo.ceph-node-02 | HTTP Request Breakdown |
-            | foo.ceph-node-02 | Workload Breakdown |