diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx index 39daad69a5b0a72..598f88387f41036 100644 --- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx +++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx @@ -116,7 +116,7 @@ export const CreateAnalyticsForm: FC = ({ actions, sta const jobConfig = getJobConfigFromFormState(form); delete jobConfig.dest; delete jobConfig.model_memory_limit; - const resp = await ml.dataFrameAnalytics.estimateMemoryUsage(jobConfig); + const resp = await ml.dataFrameAnalytics.estimateDataFrameAnalyticsMemoryUsage(jobConfig); setFormState({ modelMemoryLimit: resp.expected_memory_without_disk, }); @@ -492,7 +492,7 @@ export const CreateAnalyticsForm: FC = ({ actions, sta : DEFAULT_MODEL_MEMORY_LIMIT.outlier_detection } disabled={isJobCreated} - value={modelMemoryLimit} + value={modelMemoryLimit || ''} onChange={e => setFormState({ modelMemoryLimit: e.target.value })} isInvalid={modelMemoryLimit === ''} /> diff --git a/x-pack/legacy/plugins/ml/public/services/ml_api_service/data_frame_analytics.js b/x-pack/legacy/plugins/ml/public/services/ml_api_service/data_frame_analytics.js index 1edf5d7b879acb5..3f987a1763140e1 100644 --- a/x-pack/legacy/plugins/ml/public/services/ml_api_service/data_frame_analytics.js +++ b/x-pack/legacy/plugins/ml/public/services/ml_api_service/data_frame_analytics.js @@ -47,7 +47,7 @@ export const dataFrameAnalytics = { data: evaluateConfig }); }, - estimateMemoryUsage(jobConfig) { + estimateDataFrameAnalyticsMemoryUsage(jobConfig) { return http({ url: `${basePath}/data_frame/analytics/_estimate_memory_usage`, method: 'POST', diff --git a/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.d.ts b/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.d.ts index 007a3c324f35c08..12f39bfa78dc0d3 100644 --- a/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.d.ts +++ b/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.d.ts @@ -13,6 +13,8 @@ import { MlServerDefaults, MlServerLimits } from '../../services/ml_server_info' import { ES_AGGREGATION } from '../../../common/constants/aggregation_types'; import { DataFrameAnalyticsStats } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/common'; import { JobMessage } from '../../../common/types/audit_message'; +import { DataFrameAnalyticsConfig } from '../../data_frame_analytics/common/analytics'; +import { DeepPartial } from '../../../common/types/common'; // TODO This is not a complete representation of all methods of `ml.*`. // It just satisfies needs for other parts of the code area which use @@ -70,7 +72,9 @@ declare interface Ml { getDataFrameAnalyticsStats(analyticsId?: string): Promise; createDataFrameAnalytics(analyticsId: string, analyticsConfig: any): Promise; evaluateDataFrameAnalytics(evaluateConfig: any): Promise; - estimateMemoryUsage(jobConfig: any): Promise; + estimateDataFrameAnalyticsMemoryUsage( + jobConfig: DeepPartial + ): Promise; deleteDataFrameAnalytics(analyticsId: string): Promise; startDataFrameAnalytics(analyticsId: string): Promise; stopDataFrameAnalytics( diff --git a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js index 6199384b50a071e..3df1d3e2c3bd0ed 100644 --- a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js +++ b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js @@ -170,7 +170,7 @@ export const elasticsearchJsPlugin = (Client, config, components) => { method: 'POST' }); - ml.estimateMemoryUsage = ca({ + ml.estimateDataFrameAnalyticsMemoryUsage = ca({ urls: [ { fmt: '/_ml/data_frame/analytics/_estimate_memory_usage', diff --git a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js index 84136fc4eea715e..d467aeea31f99d8 100644 --- a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js +++ b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js @@ -96,7 +96,7 @@ export function dataFrameAnalyticsRoutes({ commonRouteConfig, elasticsearchPlugi path: '/api/ml/data_frame/analytics/_estimate_memory_usage', handler(request) { const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request); - return callWithRequest('ml.estimateMemoryUsage', { body: request.payload }) + return callWithRequest('ml.estimateDataFrameAnalyticsMemoryUsage', { body: request.payload }) .catch(resp => wrapError(resp)); }, config: {