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 <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 4b6ad4dbe88b7c8b993bca30b82b65488c3e0ba7..45bb3f0257ebc5f87f2ca3f47666fbd20548dc1f 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
@@ -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 6b497a9a0a1c6b7f67a4597294572b0aec806a96..b81fa113b9ee18ca6623ed6c999281a3e1b4eebe 100644 (file)
--- 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');
+    });
+  });
 });