diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx
index 1f4be8fa943f0..3ce07ac9803f7 100644
--- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx
+++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx
@@ -16,6 +16,7 @@ import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
import { InspectorContextProvider } from '@kbn/observability-shared-plugin/public';
+import { PerformanceContextProvider } from '@kbn/ebt-tools';
import { ClientPluginsSetup, ClientPluginsStart } from '../../plugin';
import { UMUpdateBadge } from '../lib/lib';
import {
@@ -133,19 +134,21 @@ const Application = (props: UptimeAppProps) => {
-
+
+
+
diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/overview/monitor_list/monitor_list_container.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/overview/monitor_list/monitor_list_container.tsx
index 8447f1c9d3e71..78fbdc686050e 100644
--- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/overview/monitor_list/monitor_list_container.tsx
+++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/overview/monitor_list/monitor_list_container.tsx
@@ -7,6 +7,7 @@
import React, { useContext, useEffect, useState } from 'react';
import { useSelector, useDispatch } from 'react-redux';
+import { usePageReady } from '@kbn/ebt-tools';
import { getMonitorList } from '../../../state/actions';
import { esKuerySelector, monitorListSelector } from '../../../state/selectors';
import { MonitorListComponent } from './monitor_list';
@@ -46,6 +47,8 @@ export const MonitorList: React.FC = (props) => {
const monitorList = useSelector(monitorListSelector);
useMappingCheck(monitorList.error);
+ usePageReady({ isReady: Boolean(monitorList.isLoaded) });
+
useEffect(() => {
filterCheck(() =>
dispatch(
diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/pages/overview.test.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/pages/overview.test.tsx
index 57ca69c0de184..9999215d02e8f 100644
--- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/pages/overview.test.tsx
+++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/pages/overview.test.tsx
@@ -9,6 +9,10 @@ import React from 'react';
import { OverviewPageComponent } from './overview';
import { render } from '../lib/helper/rtl_helpers';
+jest.mock('@kbn/ebt-tools', () => ({
+ usePageReady: jest.fn(),
+}));
+
describe('MonitorPage', () => {
it('renders expected elements for valid props', async () => {
const { findByText } = render();
diff --git a/x-pack/plugins/observability_solution/uptime/tsconfig.json b/x-pack/plugins/observability_solution/uptime/tsconfig.json
index 041ff7a84a4fb..8fa4d21627252 100644
--- a/x-pack/plugins/observability_solution/uptime/tsconfig.json
+++ b/x-pack/plugins/observability_solution/uptime/tsconfig.json
@@ -77,7 +77,8 @@
"@kbn/react-kibana-context-render",
"@kbn/react-kibana-context-theme",
"@kbn/react-kibana-mount",
- "@kbn/deeplinks-observability"
+ "@kbn/deeplinks-observability",
+ "@kbn/ebt-tools",
],
"exclude": ["target/**/*"]
}