Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ML] Allows temporary data views in AD job wizards #170112

Merged
merged 12 commits into from Oct 31, 2023
Merged

[ML] Allows temporary data views in AD job wizards #170112

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
949dd32
[ML] Allow temporary data views in AD job wizards
jgowdyelastic Oct 30, 2023
8a7c7c0
translations
jgowdyelastic Oct 30, 2023
26d006c
fixing test
jgowdyelastic Oct 30, 2023
37c6573
Merge branch 'main' into allow-temprary-data-views-for-AD-job-creation
jgowdyelastic Oct 30, 2023
45b6da5
Update x-pack/test/functional/apps/ml/anomaly_detection_jobs/single_m…
jgowdyelastic Oct 30, 2023
b2735a5
Merge branch 'main' into allow-temprary-data-views-for-AD-job-creation
jgowdyelastic Oct 30, 2023
5773dd2
test text
jgowdyelastic Oct 30, 2023
461e10c
fixing test
jgowdyelastic Oct 30, 2023
aa8919c
fixing test
jgowdyelastic Oct 30, 2023
d2edf7f
Merge branch 'main' into allow-temprary-data-views-for-AD-job-creation
jgowdyelastic Oct 31, 2023
f78ba67
enabling link to Discover
jgowdyelastic Oct 31, 2023
0705f89
Merge branch 'main' into allow-temprary-data-views-for-AD-job-creation
jgowdyelastic Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/ml/public/application/jobs/jobs_list/components/jobs_list/jobs_list.js
View file
Open in desktop
Expand Up @@ -399,6 +399,7 @@ export class JobsList extends Component {
rowProps={(item) => ({
'data-test-subj': `mlJobListRow row-${item.id}`,
})}
css={{ '.euiTableRow-isExpandedRow .euiTableCellContent': { animation: 'none' } }}
/>
);
}
Expand Down
20 changes: 0 additions & 20 deletions x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@ import {
import { getApplication, getToastNotifications } from '../../../util/dependency_cache';
import { ml } from '../../../services/ml_api_service';
import { stringMatch } from '../../../util/string_utils';
import { getDataViewNames } from '../../../util/index_utils';
import { JOB_STATE, DATAFEED_STATE } from '../../../../../common/constants/states';
import { JOB_ACTION } from '../../../../../common/constants/job_actions';
import { parseInterval } from '../../../../../common/util/parse_interval';
Expand Down Expand Up @@ -222,25 +221,6 @@ export async function cloneJob(jobId) {
loadFullJob(jobId, false),
]);

const dataViewNames = await getDataViewNames();
const dataViewTitle = datafeed.indices.join(',');
const jobIndicesAvailable = dataViewNames.includes(dataViewTitle);

if (jobIndicesAvailable === false) {
const warningText = i18n.translate(
'xpack.ml.jobsList.managementActions.noSourceDataViewForClone',
{
defaultMessage:
'Unable to clone the anomaly detection job {jobId}. No data view exists for index {dataViewTitle}.',
values: { jobId, dataViewTitle },
}
);
getToastNotificationService().displayDangerToast(warningText, {
'data-test-subj': 'mlCloneJobNoDataViewExistsWarningToast',
});
return;
}

const createdBy = originalJob?.custom_settings?.created_by;
if (
cloneableJob !== undefined &&
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@ export const Page: FC<PageProps> = ({ nextStepPath }) => {
uiSettings,
}}
>
<CreateDataViewButton onDataViewCreated={onObjectSelection} />
<CreateDataViewButton onDataViewCreated={onObjectSelection} allowAdHocDataView={true} />
</SavedObjectFinder>
</EuiPanel>
</EuiPageBody>
Expand Down
21 changes: 16 additions & 5 deletions ...ns/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
import type { ApplicationStart } from '@kbn/core/public';
import type { DataViewsContract } from '@kbn/data-views-plugin/public';
import { mlJobService } from '../../../../services/job_service';
import { Datafeed } from '../../../../../../common/types/anomaly_detection_jobs';
import type { Job, Datafeed } from '../../../../../../common/types/anomaly_detection_jobs';
import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../common/constants/new_job';

export async function preConfiguredJobRedirect(
Expand All @@ -19,7 +19,7 @@ export async function preConfiguredJobRedirect(
const { createdBy, job, datafeed } = mlJobService.tempJobCloningObjects;

if (job && datafeed) {
const dataViewId = await getDataViewIdFromName(datafeed, dataViewsService);
const dataViewId = await getDataViewIdFromName(job, datafeed, dataViewsService);
if (dataViewId === null) {
return Promise.resolve();
}
Expand Down Expand Up @@ -73,16 +73,27 @@ async function getWizardUrlFromCloningJob(createdBy: string | undefined, dataVie
}

async function getDataViewIdFromName(
job: Job,
datafeed: Datafeed,
dataViewsService: DataViewsContract
): Promise<string | null> {
if (dataViewsService === null) {
throw new Error('Data views are not initialized!');
}

const [dv] = await dataViewsService?.find(datafeed.indices.join(','));
if (!dv) {
return null;
const indexPattern = datafeed.indices.join(',');

const [dv] = await dataViewsService?.find(indexPattern);
if (!dv || dv.getIndexPattern() !== indexPattern) {
qn895 marked this conversation as resolved.
Show resolved Hide resolved
// create a temporary data view if we can't find one
// matching the index pattern
const dataView = await dataViewsService.create({
id: undefined,
name: indexPattern,
title: indexPattern,
timeFieldName: job.data_description.time_field!,
});
return dataView.id ?? null;
}
return dv.id ?? dv.title;
}
18 changes: 13 additions & 5 deletions x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
View file
Open in desktop
Expand Up @@ -232,11 +232,19 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {

<div style={{ backgroundColor: 'inherit' }} data-test-subj={`mlPageJobWizard ${jobType}`}>
<EuiText size={'s'}>
<FormattedMessage
id="xpack.ml.newJob.page.createJob.dataViewName"
defaultMessage="Using data view {dataViewName}"
values={{ dataViewName: jobCreator.indexPatternDisplayName }}
/>
{dataSourceContext.selectedDataView.isPersisted() ? (
<FormattedMessage
id="xpack.ml.newJob.page.createJob.dataViewName"
defaultMessage="Using data view {dataViewName}"
values={{ dataViewName: jobCreator.indexPatternDisplayName }}
/>
) : (
<FormattedMessage
id="xpack.ml.newJob.page.createJob.tempDataViewName"
defaultMessage="Using temporary data view {dataViewName}"
values={{ dataViewName: jobCreator.indexPatternDisplayName }}
/>
)}
</EuiText>

<Wizard
Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/translations/translations/fr-FR.json
View file
Open in desktop
Expand Up @@ -22522,7 +22522,6 @@
"xpack.ml.jobsList.jobDetails.forecastsTable.viewAriaLabel": "Afficher la prévision créée le {createdDate}",
"xpack.ml.jobsList.jobFilterBar.invalidSearchErrorMessage": "Recherche non valide : {errorMessage}",
"xpack.ml.jobsList.jobFilterBar.jobGroupTitle": "({jobsCount, plural, one {# tâche} many {# tâches} other {# tâches}})",
"xpack.ml.jobsList.managementActions.noSourceDataViewForClone": "Impossible de cloner la tâche de détection des anomalies {jobId}. Il n'existe aucune vue de données pour l'index {dataViewTitle}.",
"xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
"xpack.ml.jobsList.multiJobActions.groupSelector.applyGroupsToJobTitle": "Appliquer des groupes {jobsCount, plural, one {tâche} many {tâches} other {aux tâches}}",
"xpack.ml.jobsList.multiJobsActions.closeJobsLabel": "Fermer {jobsCount, plural, one {tâche} many {tâches} other {les tâches}}",
Expand Down Expand Up @@ -39373,4 +39372,4 @@
"xpack.painlessLab.walkthroughButtonLabel": "Présentation",
"xpack.serverlessObservability.nav.getStarted": "Démarrer"
}
}
}
3 changes: 1 addition & 2 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Expand Up @@ -22534,7 +22534,6 @@
"xpack.ml.jobsList.jobDetails.forecastsTable.viewAriaLabel": "{createdDate}に作成された予測を表示",
"xpack.ml.jobsList.jobFilterBar.invalidSearchErrorMessage": "無効な検索：{errorMessage}",
"xpack.ml.jobsList.jobFilterBar.jobGroupTitle": "({jobsCount, plural, other {#個のジョブ}})",
"xpack.ml.jobsList.managementActions.noSourceDataViewForClone": "異常検知ジョブ{jobId}を複製できません。インデックス{dataViewTitle}のデータビューは存在しません。",
"xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
"xpack.ml.jobsList.multiJobActions.groupSelector.applyGroupsToJobTitle": "{jobsCount, plural, other {ジョブ}}にグループを適用",
"xpack.ml.jobsList.multiJobsActions.closeJobsLabel": "{jobsCount, plural, other {ジョブ}}を閉じる",
Expand Down Expand Up @@ -39364,4 +39363,4 @@
"xpack.painlessLab.walkthroughButtonLabel": "実地検証",
"xpack.serverlessObservability.nav.getStarted": "使ってみる"
}
}
}
3 changes: 1 addition & 2 deletions x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Expand Up @@ -22533,7 +22533,6 @@
"xpack.ml.jobsList.jobDetails.forecastsTable.viewAriaLabel": "查看在 {createdDate} 创建的预测",
"xpack.ml.jobsList.jobFilterBar.invalidSearchErrorMessage": "无效搜索：{errorMessage}",
"xpack.ml.jobsList.jobFilterBar.jobGroupTitle": "({jobsCount, plural, other {# 个作业}})",
"xpack.ml.jobsList.managementActions.noSourceDataViewForClone": "无法克隆异常检测作业 {jobId}。对于索引 {dataViewTitle}，不存在数据视图。",
"xpack.ml.jobsList.missingSavedObjectWarning.link": " {link}",
"xpack.ml.jobsList.multiJobActions.groupSelector.applyGroupsToJobTitle": "将组应用到{jobsCount, plural, other {作业}}",
"xpack.ml.jobsList.multiJobsActions.closeJobsLabel": "关闭{jobsCount, plural, other {作业}}",
Expand Down Expand Up @@ -39358,4 +39357,4 @@
"xpack.painlessLab.walkthroughButtonLabel": "指导",
"xpack.serverlessObservability.nav.getStarted": "开始使用"
}
}
}
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/ml/anomaly_detection_jobs/single_metric_job.ts
View file
Open in desktop
Expand Up @@ -228,7 +228,7 @@ export default function ({ getService }: FtrProviderContext) {
await ml.api.assertDetectorResultsExist(jobId, 0);
});

it('job cloning fails in the single metric wizard if a matching data view does not exist', async () => {
it('job cloning opens in the single metric wizard if a matching data view does not exist', async () => {
jgowdyelastic marked this conversation as resolved.
Show resolved Hide resolved
await ml.testExecution.logTestStep('delete data view used by job');
await ml.testResources.deleteIndexPatternByTitle(indexPatternString);

Expand All @@ -238,7 +238,7 @@ export default function ({ getService }: FtrProviderContext) {
await ml.testExecution.logTestStep(
'job cloning clicks the clone action and displays an error toast'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should update the log test step here to reflect that it is opening the wizard

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in 5773dd2

);
await ml.jobTable.clickCloneJobActionWhenNoDataViewExists(jobId);
await ml.jobTypeSelection.assertSingleMetricJobWizardOpen();
});

it('job cloning opens the existing job in the single metric wizard', async () => {
Expand Down