improving mml warning

elastic · Sep 10, 2020 · 8875cfa · 8875cfa
1 parent e9848af
commit 8875cfa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/x-pack/plugins/ml/common/util/errors/types.ts b/x-pack/plugins/ml/common/util/errors/types.ts
@@ -15,6 +15,7 @@ export interface EsErrorRootCause {
 export interface EsErrorBody {
   error: {
     root_cause?: EsErrorRootCause[];
+    caused_by?: EsErrorRootCause;
     type: string;
     reason: string;
   };

diff --git a/...gins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts b/...gins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts
@@ -23,7 +23,7 @@ import { useEffect, useMemo } from 'react';
 import { DEFAULT_MODEL_MEMORY_LIMIT } from '../../../../../../../common/constants/new_job';
 import { ml } from '../../../../../services/ml_api_service';
 import { JobValidator, VALIDATION_DELAY_MS } from '../../job_validator/job_validator';
-import { ErrorResponse } from '../../../../../../../common/types/errors';
+import { MLHttpFetchError, MLResponseError } from '../../../../../../../common/util/errors';
 import { useMlKibana } from '../../../../../contexts/kibana';
 import { JobCreator } from '../job_creator';
 
@@ -36,10 +36,10 @@ export const modelMemoryEstimatorProvider = (
   jobValidator: JobValidator
 ) => {
   const modelMemoryCheck$ = new Subject<CalculatePayload>();
-  const error$ = new Subject<ErrorResponse['body']>();
+  const error$ = new Subject<MLHttpFetchError<MLResponseError>>();
 
   return {
-    get error$(): Observable<ErrorResponse['body']> {
+    get error$(): Observable<MLHttpFetchError<MLResponseError>> {
       return error$.asObservable();
     },
     get updates$(): Observable<string> {
@@ -64,7 +64,7 @@ export const modelMemoryEstimatorProvider = (
             catchError((error) => {
               // eslint-disable-next-line no-console
               console.error('Model memory limit could not be calculated', error.body);
-              error$.next(error.body);
+              error$.next(error);
               // fallback to the default in case estimation failed
               return of(DEFAULT_MODEL_MEMORY_LIMIT);
             })
@@ -120,7 +120,8 @@ export const useModelMemoryEstimator = (
           title: i18n.translate('xpack.ml.newJob.wizard.estimateModelMemoryError', {
             defaultMessage: 'Model memory limit could not be calculated',
           }),
-          text: error.message,
+          text:
+            error.body.attributes?.body.error.caused_by?.reason || error.body.message || undefined,
         });
       })
     );

diff --git a/...s/ml/public/application/services/toast_notification_service/toast_notification_service.ts b/...s/ml/public/application/services/toast_notification_service/toast_notification_service.ts
@@ -22,6 +22,10 @@ export function toastNotificationServiceProvider(toastNotifications: ToastsStart
     toastNotifications.addDanger(toastOrTitle, options);
   }
 
+  function displayWarningToast(toastOrTitle: ToastInput, options?: ToastOptions) {
+    toastNotifications.addWarning(toastOrTitle, options);
+  }
+
   function displaySuccessToast(toastOrTitle: ToastInput, options?: ToastOptions) {
     toastNotifications.addSuccess(toastOrTitle, options);
   }
@@ -37,7 +41,7 @@ export function toastNotificationServiceProvider(toastNotifications: ToastsStart
     });
   }
 
-  return { displayDangerToast, displaySuccessToast, displayErrorToast };
+  return { displayDangerToast, displayWarningToast, displaySuccessToast, displayErrorToast };
 }
 
 export function getToastNotificationService() {