Handle preconfiguration errors with toasts

elastic · Apr 13, 2021 · 71e3955 · 71e3955
1 parent bea7b3a
commit 71e3955
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/ingest_setup.ts b/x-pack/plugins/fleet/common/types/rest_spec/ingest_setup.ts
@@ -7,4 +7,5 @@
 
 export interface PostIngestSetupResponse {
   isInitialized: boolean;
+  preconfigurationError: { name: string; message: string } | undefined;
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -28,6 +28,7 @@ import {
   sendSetup,
   useBreadcrumbs,
   useConfig,
+  useStartServices,
 } from './hooks';
 import { Error, Loading } from './components';
 import { IntraAppStateProvider } from './hooks/use_intra_app_state';
@@ -59,6 +60,7 @@ const Panel = styled(EuiPanel)`
 
 export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
   useBreadcrumbs('base');
+  const { notifications } = useStartServices();
 
   const [isPermissionsLoading, setIsPermissionsLoading] = useState<boolean>(false);
   const [permissionsError, setPermissionsError] = useState<string>();
@@ -81,6 +83,13 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
             if (setupResponse.error) {
               setInitializationError(setupResponse.error);
             }
+            if (setupResponse.data.preconfigurationError) {
+              notifications.toasts.addError(setupResponse.data.preconfigurationError, {
+                title: i18n.translate('xpack.fleet.setup.uiPreconfigurationErrorTitle', {
+                  defaultMessage: 'Configuration error',
+                }),
+              });
+            }
           } catch (err) {
             setInitializationError(err);
           }
@@ -92,7 +101,7 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
         setPermissionsError('REQUEST_ERROR');
       }
     })();
-  }, []);
+  }, [notifications.toasts]);
 
   if (isPermissionsLoading || permissionsError) {
     return (

diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
@@ -63,13 +63,13 @@ export const createFleetSetupHandler: RequestHandler<
   try {
     const soClient = context.core.savedObjects.client;
     const esClient = context.core.elasticsearch.client.asCurrentUser;
-    await setupIngestManager(soClient, esClient);
+    const body = await setupIngestManager(soClient, esClient);
     await setupFleet(soClient, esClient, {
       forceRecreate: request.body?.forceRecreate ?? false,
     });
 
     return response.ok({
-      body: { isInitialized: true },
+      body,
     });
   } catch (error) {
     return defaultIngestErrorHandler({ error, response });
@@ -81,8 +81,7 @@ export const FleetSetupHandler: RequestHandler = async (context, request, respon
   const esClient = context.core.elasticsearch.client.asCurrentUser;
 
   try {
-    const body: PostIngestSetupResponse = { isInitialized: true };
-    await setupIngestManager(soClient, esClient);
+    const body: PostIngestSetupResponse = await setupIngestManager(soClient, esClient);
     return response.ok({
       body,
     });

diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
@@ -36,7 +36,8 @@ const FLEET_ENROLL_USERNAME = 'fleet_enroll';
 const FLEET_ENROLL_ROLE = 'fleet_enroll';
 
 export interface SetupStatus {
-  isIntialized: true | undefined;
+  isInitialized: boolean;
+  preconfigurationError: { name: string; message: string } | undefined;
 }
 
 export async function setupIngestManager(
@@ -86,14 +87,19 @@ async function createSetupSideEffects(
 
   const policies = policiesOrUndefined ?? [];
   const packages = packagesOrUndefined ?? [];
+  let preconfigurationError;
 
-  await ensurePreconfiguredPackagesAndPolicies(
-    soClient,
-    esClient,
-    policies,
-    packages,
-    defaultOutput
-  );
+  try {
+    await ensurePreconfiguredPackagesAndPolicies(
+      soClient,
+      esClient,
+      policies,
+      packages,
+      defaultOutput
+    );
+  } catch (e) {
+    preconfigurationError = { name: e.name, message: e.message };
+  }
 
   // Ensure the predefined default policies AFTER loading preconfigured policies. This allows the kibana config
   // to override the default agent policies.
@@ -170,7 +176,7 @@ async function createSetupSideEffects(
 
   await ensureAgentActionPolicyChangeExists(soClient);
 
-  return { isIntialized: true };
+  return { isInitialized: true, preconfigurationError };
 }
 
 async function updateFleetRoleIfExists(esClient: ElasticsearchClient) {