From adbccad770796f3fb25a7c751416e2c445eab45b Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Wed, 5 Apr 2023 22:26:26 +0530 Subject: [PATCH] mgr/dashboard: fix for grafana e2e failing on rgw daemon performance Started happening after: https://github.com/ceph/ceph/pull/49248/ Fixes: https://tracker.ceph.com/issues/59353 Signed-off-by: Nizamudeen A --- .../mgr/dashboard/ci/cephadm/run-cephadm-e2e-tests.sh | 2 ++ .../orchestrator/workflow/09-services.e2e-spec.ts | 7 +++++++ 2 files changed, 9 insertions(+) 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 4b6ad4dbe88b7..45bb3f0257ebc 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,7 @@ 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'"' +kcli ssh -u root ceph-node-00 'cephadm shell "ceph config set mgr mgr/prometheus/exclude_perf_counters false"' + cypress_run ["orchestrator/workflow/*.feature, orchestrator/workflow/*-spec.ts"] cypress_run "orchestrator/grafana/*.feature" diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts index 6b497a9a0a1c6..b81fa113b9ee1 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts @@ -123,4 +123,11 @@ describe('Services page', () => { services.isUnmanaged('ingress.rgw.foo', true); services.deleteService('ingress.rgw.foo'); }); + + it('should check if exporter daemons are running', () => { + services.clickServiceTab('ceph-exporter', 'Details'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus('ceph-exporter', 'running'); + }); + }); }); -- 2.39.5