Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Uptime] Report uptime overview metrics #191708

Merged
merged 6 commits into from
Aug 30, 2024
Merged

[Uptime] Report uptime overview metrics #191708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d1f1ad
report uptime overview metrics
shahzad31 Aug 29, 2024
087a811
[CI] Auto-commit changed files from 'node scripts/yarn_deduplicate'
kibanamachine Aug 29, 2024
a129f23
Merge branch 'main' of https://github.com/elastic/kibana into perf-up…
shahzad31 Aug 29, 2024
a313e43
Merge branch 'perf-uptime-overview' of https://github.com/shahzad31/k…
shahzad31 Aug 29, 2024
60524d1
fix tests
shahzad31 Aug 29, 2024
b8fc7da
Merge branch 'main' into perf-uptime-overview
shahzad31 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -133,19 +134,21 @@ const Application = (props: UptimeAppProps) => {
<UptimeThemeContextProvider darkMode={darkMode}>
<UptimeStartupPluginsContextProvider {...startPlugins}>
<UptimeDataViewContextProvider dataViews={startPlugins.dataViews}>
<div className={APP_WRAPPER_CLASS} data-test-subj="uptimeApp">
<RedirectAppLinks
coreStart={{
application: core.application,
}}
>
<InspectorContextProvider>
<UptimeAlertsFlyoutWrapper />
<PageRouter />
<ActionMenu appMountParameters={appMountParameters} />
</InspectorContextProvider>
</RedirectAppLinks>
</div>
<PerformanceContextProvider>
<div className={APP_WRAPPER_CLASS} data-test-subj="uptimeApp">
<RedirectAppLinks
coreStart={{
application: core.application,
}}
>
<InspectorContextProvider>
<UptimeAlertsFlyoutWrapper />
<PageRouter />
<ActionMenu appMountParameters={appMountParameters} />
</InspectorContextProvider>
</RedirectAppLinks>
</div>
</PerformanceContextProvider>
</UptimeDataViewContextProvider>
</UptimeStartupPluginsContextProvider>
</UptimeThemeContextProvider>
Expand Down
3 changes: 3 additions & 0 deletions ...n/uptime/public/legacy_uptime/components/overview/monitor_list/monitor_list_container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -46,6 +47,8 @@ export const MonitorList: React.FC<MonitorListProps> = (props) => {
const monitorList = useSelector(monitorListSelector);
useMappingCheck(monitorList.error);

usePageReady({ isReady: Boolean(monitorList.isLoaded) });

useEffect(() => {
filterCheck(() =>
dispatch(
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugins/observability_solution/uptime/public/legacy_uptime/pages/overview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(<OverviewPageComponent />);
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/observability_solution/uptime/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"@kbn/react-kibana-context-theme",
"@kbn/react-kibana-mount",
"@kbn/deeplinks-observability",
"@kbn/ebt-tools",
],
"exclude": ["target/**/*"]
}