[ML] Support multiple model deployments

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

@@ -51,7 +51,7 @@ export interface TrainedModelStat {
  }
  >;
  };
- deployment_stats?: Omit<TrainedModelDeploymentStatsResponse, 'model_id'>;
+ deployment_stats?: TrainedModelDeploymentStatsResponse;
  model_size_stats?: TrainedModelModelSizeStats;
 }
 
@@ -128,6 +128,7 @@ export interface InferenceConfigResponse {
 
 export interface TrainedModelDeploymentStatsResponse {
  model_id: string;
+ deployment_id: string;
  inference_threads: number;
  model_threads: number;
  state: DeploymentState;
@@ -163,6 +164,8 @@ export interface TrainedModelDeploymentStatsResponse {
 }
 
 export interface AllocatedModel {
+ key: string;
+ deployment_id: string;
  inference_threads: number;
  allocation_status: {
  target_allocation_count: number;

x-pack/plugins/ml/common/util/validators.ts

@@ -99,3 +99,13 @@ export function timeIntervalInputValidator() {
  return null;
  };
 }
+
+export function dictionaryValidator(dict: string[], shouldInclude: boolean = false) {
+ const dictSet = new Set(dict);
+ return (value: string) => {
+ if (dictSet.has(value) !== shouldInclude) {
+ return { matchDict: value };
+ }
+ return null;
+ };
+}

x-pack/plugins/ml/public/application/memory_usage/nodes_overview/allocated_models.tsx

@@ -39,6 +39,33 @@ export const AllocatedModels: FC<AllocatedModelsProps> = ({
  const euiTheme = useEuiTheme();
 
  const columns: Array<EuiBasicTableColumn<AllocatedModel>> = [
+ {
+ id: 'deployment_id',
+ field: 'deployment_id',
+ name: i18n.translate('xpack.ml.trainedModels.nodesList.modelsList.deploymentIdHeader', {
+ defaultMessage: 'ID',
+ }),
+ width: '150px',
+ sortable: true,
+ truncateText: false,
+ 'data-test-subj': 'mlAllocatedModelsTableDeploymentId',
+ },
+ {
+ name: i18n.translate('xpack.ml.trainedModels.nodesList.modelsList.modelRoutingStateHeader', {
+ defaultMessage: 'Routing state',
+ }),
+ width: '100px',
+ 'data-test-subj': 'mlAllocatedModelsTableRoutingState',
+ render: (v: AllocatedModel) => {
+ const { routing_state: routingState, reason } = v.node.routing_state;
+
+ return (
+ <EuiToolTip content={reason ? reason : ''}>
+ <EuiBadge color={reason ? 'danger' : 'hollow'}>{routingState}</EuiBadge>
+ </EuiToolTip>
+ );
+ },
+ },
  {
  id: 'node_name',
  field: 'node.name',
@@ -193,22 +220,6 @@ export const AllocatedModels: FC<AllocatedModelsProps> = ({
  return v.node.number_of_pending_requests;
  },
  },
- {
- name: i18n.translate('xpack.ml.trainedModels.nodesList.modelsList.modelRoutingStateHeader', {
- defaultMessage: 'Routing state',
- }),
- width: '100px',
- 'data-test-subj': 'mlAllocatedModelsTableRoutingState',
- render: (v: AllocatedModel) => {
- const { routing_state: routingState, reason } = v.node.routing_state;
-
- return (
- <EuiToolTip content={reason ? reason : ''}>
- <EuiBadge color={reason ? 'danger' : 'hollow'}>{routingState}</EuiBadge>
- </EuiToolTip>
- );
- },
- },
  ].filter((v) => !hideColumns.includes(v.id!));
 
  return (
@@ -219,7 +230,7 @@ export const AllocatedModels: FC<AllocatedModelsProps> = ({
  isExpandable={false}
  isSelectable={false}
  items={models}
- itemId={'model_id'}
+ itemId={'key'}
  rowProps={(item) => ({
  'data-test-subj': `mlAllocatedModelTableRow row-${item.model_id}`,
  })}