[ML] Model management fixes and usability enhancements

x-pack/plugins/ml/common/index.ts

@@ -14,3 +14,4 @@ export { composeValidators, patternValidator } from './util/validators';
 export { isRuntimeMappings, isRuntimeField } from './util/runtime_field_utils';
 export { extractErrorMessage } from './util/errors';
 export type { RuntimeMappings } from './types/fields';
+export { getDefaultCapabilities as getDefaultMlCapabilities } from './types/capabilities';

x-pack/plugins/ml/common/types/capabilities.ts

@@ -63,6 +63,8 @@ export const adminMlCapabilities = {
   // Alerts
   canCreateMlAlerts: false,
   canUseMlAlerts: false,
+  // Model management
+  canViewMlNodes: false,
 };
 
 export type UserMlCapabilities = typeof userMlCapabilities;

x-pack/plugins/ml/common/types/trained_models.ts

@@ -151,6 +151,8 @@ export interface TrainedModelDeploymentStatsResponse {
     routing_state: { routing_state: string };
     average_inference_time_ms: number;
     last_access: number;
+    number_of_pending_requests: number;
+    start_time: number;
   }>;
 }
 
@@ -161,25 +163,33 @@ export interface AllocatedModel {
     state: string;
     allocation_count: number;
   };
-  model_id: string;
+  /**
+   * Not required for rendering in the Model stats
+   */
+  model_id?: string;
   state: string;
   model_threads: number;
   model_size_bytes: number;
   node: {
+    /**
+     * Not required for rendering in the Nodes overview
+     */
+    name?: string;
     average_inference_time_ms: number;
     inference_count: number;
     routing_state: {
       routing_state: string;
       reason?: string;
     };
     last_access?: number;
+    number_of_pending_requests: number;
+    start_time: number;
   };
 }
 
 export interface NodeDeploymentStatsResponse {
   id: string;
   name: string;
-  transport_address: string;
   attributes: Record<string, string>;
   roles: string[];
   allocated_models: AllocatedModel[];

x-pack/plugins/ml/public/application/components/help_icon/help_icon.tsx

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, ReactNode } from 'react';
+import { EuiIcon, EuiToolTip } from '@elastic/eui';
+
+export const HelpIcon: FC<{ content: ReactNode | string }> = ({ content }) => {
+  return (
+    <EuiToolTip position="top" content={content}>
+      <EuiIcon
+        tabIndex={0}
+        type="questionInCircle"
+        color={'subdued'}
+        className="eui-alignTop"
+        size="s"
+      />
+    </EuiToolTip>
+  );
+};

x-pack/plugins/ml/public/application/components/help_icon/index.tsx

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { HelpIcon } from './help_icon';

x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts

@@ -15,7 +15,6 @@ import {
   ModelPipelines,
   TrainedModelStat,
   NodesOverviewResponse,
-  TrainedModelDeploymentStatsResponse,
 } from '../../../../common/types/trained_models';
 
 export interface InferenceQueryParams {
@@ -122,21 +121,6 @@ export function trainedModelsApiProvider(httpService: HttpService) {
       });
     },
 
-    getTrainedModelDeploymentStats(modelId?: string | string[]) {
-      let model = modelId ?? '*';
-      if (Array.isArray(modelId)) {
-        model = modelId.join(',');
-      }
-
-      return httpService.http<{
-        count: number;
-        deployment_stats: TrainedModelDeploymentStatsResponse[];
-      }>({
-        path: `${apiBasePath}/trained_models/${model}/deployment/_stats`,
-        method: 'GET',
-      });
-    },
-
     getTrainedModelsNodesOverview() {
       return httpService.http<NodesOverviewResponse>({
         path: `${apiBasePath}/trained_models/nodes_overview`,