Skip to content

Commit

Permalink
[ML] Trained Models: Fixes spaces sync to retrieve 10000 models (elas…
Browse files Browse the repository at this point in the history
…tic#202712)

## Summary

The default page size for the /trained_models API is 100. As a result,
the spaces sync task only fetched the first 100 models, leaving the rest
unassigned to spaces and therefore invisible in the ML UI.

This PR increases the page size to 10,000 to ensure all models are
properly assigned to Kibana spaces.

### Checklist

- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
  • Loading branch information
darnautov authored Dec 3, 2024
1 parent 1edcb62 commit ded18ee
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
12 changes: 12 additions & 0 deletions x-pack/plugins/ml/common/constants/trained_models.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* 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.
*/

/**
* Default page for the trained_models endpoint is 100,
* which is too small for the most cases, so we set it to 10000.
*/
export const DEFAULT_TRAINED_MODELS_PAGE_SIZE = 10000;
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
} from '@kbn/ml-data-frame-analytics-utils';
import { isPopulatedObject } from '@kbn/ml-is-populated-object';
import type { CloudSetup } from '@kbn/cloud-plugin/server';
import { DEFAULT_TRAINED_MODELS_PAGE_SIZE } from '../../../common/constants/trained_models';
import type { MlFeatures } from '../../../common/constants/app';
import type { ModelService } from '../model_management/models_provider';
import { modelsProvider } from '../model_management';
Expand All @@ -38,7 +39,6 @@ import {
isTransformLinkReturnType,
} from './types';
import type { MlClient } from '../../lib/ml_client';
import { DEFAULT_TRAINED_MODELS_PAGE_SIZE } from '../../routes/trained_models';

export class AnalyticsManager {
private _trainedModels: estypes.MlTrainedModelConfig[] = [];
Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/ml/server/routes/trained_models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type {
} from '@kbn/ml-trained-models-utils';
import { isDefined } from '@kbn/ml-is-defined';
import type { IScopedClusterClient } from '@kbn/core-elasticsearch-server';
import { DEFAULT_TRAINED_MODELS_PAGE_SIZE } from '../../common/constants/trained_models';
import { type MlFeatures, ML_INTERNAL_BASE_PATH } from '../../common/constants/app';
import type { RouteInitialization } from '../types';
import { wrapError } from '../client/error_wrapper';
Expand Down Expand Up @@ -44,8 +45,6 @@ import { mlLog } from '../lib/log';
import { forceQuerySchema } from './schemas/anomaly_detectors_schema';
import { modelsProvider } from '../models/model_management';

export const DEFAULT_TRAINED_MODELS_PAGE_SIZE = 10000;

export function filterForEnabledFeatureModels<
T extends TrainedModelConfigResponse | estypes.MlTrainedModelConfig
>(models: T[], enabledFeatures: MlFeatures) {
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/ml/server/saved_objects/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
type IScopedClusterClient,
SavedObjectsClient,
} from '@kbn/core/server';
import { DEFAULT_TRAINED_MODELS_PAGE_SIZE } from '../../common/constants/trained_models';
import type { TrainedModelJob, MLSavedObjectService } from './service';
import { ML_JOB_SAVED_OBJECT_TYPE } from '../../common/types/saved_objects';

Expand Down Expand Up @@ -86,7 +87,9 @@ export function mlFunctionsFactory(client: IScopedClusterClient) {
},
async getTrainedModels() {
try {
return await client.asInternalUser.ml.getTrainedModels();
return await client.asInternalUser.ml.getTrainedModels({
size: DEFAULT_TRAINED_MODELS_PAGE_SIZE,
});
} catch (error) {
return null;
}
Expand Down

0 comments on commit ded18ee

Please sign in to comment.