maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Fleet] Handle errors happenning during Fleet setup in the UI (#87185)

Browse source
This commit is contained in:
Nicolas Chaulet 2021-01-04 19:02:25 -04:00 committed by GitHub
parent e3856a9e45
commit a0f330cc8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x-pack/plugins/fleet/public/applications/fleet/hooks/use_fleet_status.tsx
View file

@ -13,6 +13,7 @@ interface FleetStatusState {
enabled: boolean;
isLoading: boolean;
isReady: boolean;
error?: Error;
missingRequirements?: GetFleetStatusResponse['missing_requirements'];
}
@ -44,7 +45,7 @@ export const FleetStatusProvider: React.FC = ({ children }) => {
missingRequirements: res.data?.missing_requirements,
}));
} catch (error) {
setState((s) => ({ ...s, isLoading: true }));
setState((s) => ({ ...s, isLoading: false, error }));
}
}
useEffect(() => {

20
x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx
View file

@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
import { PAGE_ROUTING_PATHS } from '../../constants';
import { Loading } from '../../components';
import { Loading, Error } from '../../components';
import { useConfig, useFleetStatus, useBreadcrumbs, useCapabilities } from '../../hooks';
import { AgentListPage } from './agent_list_page';
import { SetupPage } from './setup_page';
@ -14,6 +15,7 @@ import { AgentDetailsPage } from './agent_details_page';
import { NoAccessPage } from './error_pages/no_access';
import { EnrollmentTokenListPage } from './enrollment_token_list_page';
import { ListLayout } from './components/list_layout';
import { WithoutHeaderLayout } from '../../layouts';
export const FleetApp: React.FunctionComponent = () => {
useBreadcrumbs('fleet');
@ -27,6 +29,22 @@ export const FleetApp: React.FunctionComponent = () => {
return <Loading />;
}
if (fleetStatus.error) {
return (
<WithoutHeaderLayout>
<Error
title={
<FormattedMessage
id="xpack.fleet.agentsInitializationErrorMessageTitle"
defaultMessage="Unable to initialize central management for Elastic Agents"
/>
}
error={fleetStatus.error}
/>
</WithoutHeaderLayout>
);
}
if (fleetStatus.isReady === false) {
return (
<SetupPage