[8.x] [ML] Redesign start/update model deployment dialog (#190243) (#…

…194143) # Backport This will backport the following commits from `main` to `8.x`: - [[ML] Redesign start/update model deployment dialog (#190243)](#190243)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Dima Arnautov <[email protected]>
elastic · Sep 26, 2024 · e72fd8f · e72fd8f
1 parent ef7048f
commit e72fd8f
Show file tree

Hide file tree

Showing 25 changed files with 1,751 additions and 496 deletions.
diff --git a/x-pack/packages/ml/agg_utils/src/validate_number.test.ts b/x-pack/packages/ml/agg_utils/src/validate_number.test.ts
@@ -8,6 +8,16 @@
 import { numberValidator } from './validate_number';
 
 describe('numberValidator', () => {
+  it('should allow an empty value if not required', () => {
+    const validator = numberValidator({ min: 1, integerOnly: true, required: false });
+    expect(validator(undefined)).toStrictEqual(null);
+  });
+
+  it('should not allow an empty value if required', () => {
+    const validator = numberValidator({ min: 1, integerOnly: true, required: true });
+    expect(validator(undefined)).toStrictEqual({ required: true });
+  });
+
   it('should only allow integers above zero', () => {
     const integerOnlyValidator = numberValidator({ min: 1, integerOnly: true });
     // invalid

diff --git a/x-pack/packages/ml/agg_utils/src/validate_number.ts b/x-pack/packages/ml/agg_utils/src/validate_number.ts
@@ -12,16 +12,16 @@ import { isPopulatedObject } from '@kbn/ml-is-populated-object';
  * Represents the result of number validation.
  * @interface
  */
-export interface NumberValidationResult {
+export type NumberValidationResult = { [key: string]: boolean } & {
   /** The minimum allowed value. */
-  min: boolean;
+  min?: boolean;
 
   /** The maximum allowed value. */
-  max: boolean;
+  max?: boolean;
 
   /** Boolean flag to allow integer values only. */
-  integerOnly: boolean;
-}
+  integerOnly?: boolean;
+};
 
 /**
  * An interface describing conditions for validating numbers.
@@ -42,6 +42,8 @@ interface NumberValidatorConditions {
    * Indicates whether only integer values are valid.
    */
   integerOnly?: boolean;
+
+  required?: boolean;
 }
 
 /**
@@ -60,8 +62,18 @@ export function numberValidator(conditions?: NumberValidatorConditions) {
     throw new Error('Invalid validator conditions');
   }
 
-  return memoize((value: number): NumberValidationResult | null => {
+  return memoize((value: number | undefined): NumberValidationResult | null => {
     const result = {} as NumberValidationResult;
+
+    if (value === undefined) {
+      if (conditions?.required) {
+        result.required = true;
+        return result;
+      } else {
+        return null;
+      }
+    }
+
     if (conditions?.min !== undefined && value < conditions.min) {
       result.min = true;
     }

diff --git a/x-pack/plugins/ml/common/types/trained_models.ts b/x-pack/plugins/ml/common/types/trained_models.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { DeploymentState, TrainedModelType } from '@kbn/ml-trained-models-utils';
+import type { TrainedModelType } from '@kbn/ml-trained-models-utils';
 import type {
   DataFrameAnalyticsConfig,
   FeatureImportanceBaseline,
@@ -141,48 +141,46 @@ export interface InferenceConfigResponse {
   trained_model_configs: TrainedModelConfigResponse[];
 }
 
-export interface TrainedModelDeploymentStatsResponse {
-  model_id: string;
-  deployment_id: string;
-  inference_threads: number;
-  model_threads: number;
-  state: DeploymentState;
+type NodesDeploymentStats = Array<{
+  node: Record<
+    string,
+    {
+      transport_address: string;
+      roles: string[];
+      name: string;
+      attributes: {
+        'ml.machine_memory': string;
+        'xpack.installed': string;
+        'ml.max_open_jobs': string;
+        'ml.max_jvm_size': string;
+      };
+      ephemeral_id: string;
+    }
+  >;
+  inference_count: number;
+  routing_state: { routing_state: string };
+  average_inference_time_ms: number;
+  last_access: number;
+  number_of_pending_requests: number;
+  start_time: number;
+  throughput_last_minute: number;
   threads_per_allocation: number;
   number_of_allocations: number;
-  allocation_status: { target_allocation_count: number; state: string; allocation_count: number };
-  nodes: Array<{
-    node: Record<
-      string,
-      {
-        transport_address: string;
-        roles: string[];
-        name: string;
-        attributes: {
-          'ml.machine_memory': string;
-          'xpack.installed': string;
-          'ml.max_open_jobs': string;
-          'ml.max_jvm_size': string;
-        };
-        ephemeral_id: string;
-      }
-    >;
-    inference_count: number;
-    routing_state: { routing_state: string };
-    average_inference_time_ms: number;
-    last_access: number;
-    number_of_pending_requests: number;
-    start_time: number;
-    throughput_last_minute: number;
-    threads_per_allocation: number;
-    number_of_allocations: number;
-  }>;
-  reason?: string;
-}
+}>;
+
+export type TrainedModelDeploymentStatsResponse = estypes.MlTrainedModelDeploymentStats & {
+  nodes: NodesDeploymentStats;
+  // TODO update types in elasticsearch-specification
+  adaptive_allocations?: {
+    enabled: boolean;
+    min_number_of_allocations?: number;
+    max_number_of_allocations?: number;
+  };
+};
 
 export interface AllocatedModel {
   key: string;
   deployment_id: string;
-  inference_threads: number;
   allocation_status: {
     target_allocation_count: number;
     state: string;
@@ -195,7 +193,6 @@ export interface AllocatedModel {
    */
   model_id?: string;
   state: string;
-  model_threads: number;
   model_size_bytes: number;
   required_native_memory_bytes: number;
   node: {
@@ -217,6 +214,11 @@ export interface AllocatedModel {
     threads_per_allocation?: number;
     error_count?: number;
   };
+  adaptive_allocations?: {
+    enabled: boolean;
+    min_number_of_allocations?: number;
+    max_number_of_allocations?: number;
+  };
 }
 
 export interface NodeDeploymentStatsResponse {

diff --git a/.../jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx b/.../jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
@@ -71,6 +71,8 @@ const MLJobsAwaitingNodeWarning: FC<Props> = ({ jobIds }) => {
         cloudId,
         isCloudTrial,
         deploymentId: cloudId === null ? null : extractDeploymentId(cloudId),
+        isMlAutoscalingEnabled: resp.isMlAutoscalingEnabled,
+        cloudUrl: resp.cloudUrl ?? null,
       });
     } catch (error) {
       setCloudInfo(null);

diff --git a/x-pack/plugins/ml/public/application/components/node_available_warning/hooks.ts b/x-pack/plugins/ml/public/application/components/node_available_warning/hooks.ts
@@ -70,6 +70,8 @@ const defaultCloudInfo: CloudInfo = {
   isCloud: false,
   isCloudTrial: false,
   deploymentId: null,
+  cloudUrl: null,
+  isMlAutoscalingEnabled: false,
 };
 
 export function useCloudCheck() {
@@ -85,6 +87,8 @@ export function useCloudCheck() {
         isCloud: resp.cloudId !== undefined,
         isCloudTrial: resp.isCloudTrial === true,
         deploymentId: !resp.cloudId ? null : extractDeploymentId(resp.cloudId),
+        cloudUrl: resp.cloudUrl ?? null,
+        isMlAutoscalingEnabled: resp.isMlAutoscalingEnabled,
       });
     } catch (error) {
       if (error.statusCode === 403) {

diff --git a/x-pack/plugins/ml/public/application/memory_usage/nodes_overview/allocated_models.tsx b/x-pack/plugins/ml/public/application/memory_usage/nodes_overview/allocated_models.tsx
@@ -126,7 +126,30 @@ export const AllocatedModels: FC<AllocatedModelsProps> = ({
         ) {
           return '-';
         }
-        return `${v.node.number_of_allocations} * ${v.node.threads_per_allocation}`;
+
+        let adaptiveAllocations = null;
+        if (v.adaptive_allocations?.enabled) {
+          adaptiveAllocations = (
+            <EuiToolTip
+              content={i18n.translate(
+                'xpack.ml.trainedModels.nodesList.modelsList.adaptiveAllocationsTooltip',
+                {
+                  defaultMessage: 'Adaptive allocations enabled',
+                }
+              )}
+            >
+              <EuiIcon size="l" color="warning" type="scale" />
+            </EuiToolTip>
+          );
+        }
+        return (
+          <>
+            <>
+              {v.node.number_of_allocations} * {v.node.threads_per_allocation}
+            </>
+            {adaptiveAllocations}
+          </>
+        );
       },
     },
     {