[ML] Switching to new es client

x-pack/plugins/apm/server/lib/helpers/setup_request.ts

@@ -114,16 +114,13 @@ function getMlSetup(context: APMRequestHandlerContext, request: KibanaRequest) {
   if (!context.plugins.ml) {
     return;
   }
+
   const ml = context.plugins.ml;
-  const mlClient = ml.mlClient.asScoped(request);
+  const client = context.core.elasticsearch.client;
   return {
-    mlSystem: ml.mlSystemProvider(mlClient, request),
-    anomalyDetectors: ml.anomalyDetectorsProvider(mlClient, request),
-    modules: ml.modulesProvider(
-      mlClient,
-      request,
-      context.core.savedObjects.client
-    ),
-    mlClient,
+    mlSystem: ml.mlSystemProvider(request),
+    anomalyDetectors: ml.anomalyDetectorsProvider(request),
+    modules: ml.modulesProvider(request, context.core.savedObjects.client),
+    client,
   };
 }

x-pack/plugins/infra/server/plugin.ts

@@ -152,9 +152,8 @@ export class InfraServerPlugin {
     core.http.registerRouteHandlerContext(
       'infra',
       (context, request): InfraRequestHandlerContext => {
-        const mlSystem = context.ml && plugins.ml?.mlSystemProvider(context.ml?.mlClient, request);
-        const mlAnomalyDetectors =
-          context.ml && plugins.ml?.anomalyDetectorsProvider(context.ml?.mlClient, request);
+        const mlSystem = plugins.ml?.mlSystemProvider(request);
+        const mlAnomalyDetectors = plugins.ml?.anomalyDetectorsProvider(request);
         const spaceId = plugins.spaces?.spacesService.getSpaceId(request) || 'default';
 
         return {

x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx

@@ -93,11 +93,11 @@ function title(statuses: Statuses) {
   }
 }
 
-function ImportError(error: any, key: number) {
+const ImportError: FC<{ error: any }> = ({ error }) => {
   const errorObj = toString(error);
   return (
-    <React.Fragment>
-      <p key={key}>{errorObj.msg}</p>
+    <>
+      <p>{errorObj.msg}</p>
 
       {errorObj.more !== undefined && (
         <EuiAccordion
@@ -113,9 +113,9 @@ function ImportError(error: any, key: number) {
           {errorObj.more}
         </EuiAccordion>
       )}
-    </React.Fragment>
+    </>
   );
-}
+};
 
 function toString(error: any): ImportError {
   if (typeof error === 'string') {
@@ -127,11 +127,11 @@ function toString(error: any): ImportError {
       return { msg: error.msg };
     } else if (error.error !== undefined) {
       if (typeof error.error === 'object') {
-        if (error.error.msg !== undefined) {
+        if (error.error.reason !== undefined) {
           // this will catch a bulk ingest failure
-          const errorObj: ImportError = { msg: error.error.msg };
-          if (error.error.body !== undefined) {
-            errorObj.more = error.error.response;
+          const errorObj: ImportError = { msg: error.error.reason };
+          if (error.error.root_cause !== undefined) {
+            errorObj.more = JSON.stringify(error.error.root_cause);
           }
           return errorObj;
         }

x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts

@@ -71,9 +71,7 @@ export class ChartLoader {
         splitFieldName,
         splitFieldValue
       );
-      if (resp.error !== undefined) {
-        throw resp.error;
-      }
+
       return resp.results;
     }
     return {};
@@ -105,9 +103,7 @@ export class ChartLoader {
         aggFieldPairNames,
         splitFieldName
       );
-      if (resp.error !== undefined) {
-        throw resp.error;
-      }
+
       return resp.results;
     }
     return {};