From: Nizamudeen A Date: Wed, 24 May 2023 08:35:32 +0000 (+0530) Subject: mgr/dashboard: fix the cephadm grafana e2e failure X-Git-Tag: v18.1.1~57^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3aad5fce6663e7656b597b07ccd3b899ca5dd05b;p=ceph.git mgr/dashboard: fix the cephadm grafana e2e failure Fixes: https://tracker.ceph.com/issues/61354 Signed-off-by: Nizamudeen A (cherry picked from commit c56e10af0b71b65f405f4a1c6a8c137bc6a62a13) --- 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 dbb2cb61bbf..83b2eb69488 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh @@ -53,5 +53,5 @@ kcli ssh -u root ceph-node-00 'cephadm shell "ceph dashboard set-prometheus-api- kcli ssh -u root ceph-node-00 'cephadm shell "ceph dashboard set-grafana-api-url https://192.168.100.100:3000"' kcli ssh -u root ceph-node-00 'cephadm shell "ceph orch apply node-exporter --placement 'count:2'"' -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 4b2ee4d0043..edd0e9b5632 100644 --- 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 62476ad25a4..fc023712ec2 100644 --- 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 |