From 41d74498e86df70d95a07cc572fa92c226c78d89 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Tue, 11 Jun 2019 15:02:35 +0100 Subject: [PATCH] [ML] Edit job_service jobsExist call to query ML Get Jobs endpoint (#38649) --- .../ml/common/constants/index_patterns.ts | 1 - .../ml/server/models/job_service/jobs.js | 20 +++---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/x-pack/plugins/ml/common/constants/index_patterns.ts b/x-pack/plugins/ml/common/constants/index_patterns.ts index 16554b1be164..429cf8454325 100644 --- a/x-pack/plugins/ml/common/constants/index_patterns.ts +++ b/x-pack/plugins/ml/common/constants/index_patterns.ts @@ -8,6 +8,5 @@ export const ML_ANNOTATIONS_INDEX_ALIAS_READ = '.ml-annotations-read'; export const ML_ANNOTATIONS_INDEX_ALIAS_WRITE = '.ml-annotations-write'; export const ML_ANNOTATIONS_INDEX_PATTERN = '.ml-annotations-6'; -export const ML_CONFIG_INDEX_PATTERN = '.ml-config'; export const ML_RESULTS_INDEX_PATTERN = '.ml-anomalies-*'; export const ML_NOTIFICATION_INDEX_PATTERN = '.ml-notifications'; diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.js b/x-pack/plugins/ml/server/models/job_service/jobs.js index 84c7c1550ef6..404b0d572c01 100644 --- a/x-pack/plugins/ml/server/models/job_service/jobs.js +++ b/x-pack/plugins/ml/server/models/job_service/jobs.js @@ -6,7 +6,6 @@ import { i18n } from '@kbn/i18n'; -import { ML_CONFIG_INDEX_PATTERN } from '../../../common/constants/index_patterns'; import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states'; import { datafeedsProvider } from './datafeeds'; import { jobAuditMessagesProvider } from '../job_audit_messages'; @@ -328,24 +327,11 @@ export function jobsProvider(callWithRequest) { // e.g. *_low_request_rate_ecs async function jobsExist(jobIds = []) { // Get the list of job IDs. - // Use size of 10000, matching anomaly_detectors endpoint. - const maxJobsSize = 10000; - const resp = await callWithRequest('search', { - index: ML_CONFIG_INDEX_PATTERN, - size: maxJobsSize, - body: { - _source: 'job_id', - query: { - term: { job_type: 'anomaly_detector' } - } - } - }); + const jobsInfo = await callWithRequest('ml.jobs', { jobId: jobIds }); const results = {}; - let allJobIds = []; - if (resp.hits.total.value > 0) { - const hits = resp.hits.hits; - allJobIds = hits.map(hit => hit._source.job_id); + if (jobsInfo.count > 0) { + const allJobIds = jobsInfo.jobs.map(job => job.job_id); // Check if each of the supplied IDs match existing jobs. jobIds.forEach((jobId) => {