Skip to content

[9.0] [ML] Fixes import and improves validation for Anomaly Detection and Data Frame Analytics jobs (#242263) #243947

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

Closed
KodeRad wants to merge 1 commit into from
Closed

[9.0] [ML] Fixes import and improves validation for Anomaly Detection and Data Frame Analytics jobs (#242263) #243947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion x-pack/platform/plugins/private/translations/translations/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28543,7 +28543,6 @@
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListAria": "afficher les tâches",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListButton": "Afficher les tâches",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters": "{num, plural, one {Liste de filtres manquante} other {Listes de filtres manquantes}} : {filters}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingIndex": "{num, plural, one {Modèle d'indexation manquant} other {Modèles d'indexation manquants}} : {indices}",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.body": "Veuillez sélectionner un fichier contenant des tâches de Machine Learning qui ont été exportées de Kibana à l'aide de l'option Exporter les tâches",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.title": "Impossible de lire le fichier",
"xpack.ml.importExport.importFlyout.closeButton": "Fermer",
Expand Down
5 changes: 2 additions & 3 deletions x-pack/platform/plugins/private/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28521,9 +28521,8 @@
"xpack.ml.importExport.importButton": "ジョブのインポート",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListAria": "ジョブを表示",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListButton": "ジョブを表示",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters": "フィルター{num, plural, other {リスト}}がありません：{filters}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingIndex": "インデックス{num, plural, other {パターン}}がありません：{indices}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.title": "{num, plural, other {# 件のジョブ}}をインポートできません",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters": "フィルター{num, plural, one {list} other {リスト}}がありません：{filters}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.title": "{num, plural, one {# job} other {# 件のジョブ}}をインポートできません",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.body": "ジョブのエクスポートオプションを使用してKibanaからエクスポートされた機械学習ジョブを含むファイルを選択してください。",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.title": "ファイルを読み取れません",
"xpack.ml.importExport.importFlyout.closeButton": "閉じる",
Expand Down
7 changes: 3 additions & 4 deletions x-pack/platform/plugins/private/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28570,9 +28570,8 @@
"xpack.ml.importExport.importButton": "导入作业",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListAria": "查看作业",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.jobListButton": "查看作业",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters": "缺失筛选{num, plural, other {列表}}：{filters}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingIndex": "缺失索引{num, plural, other {模式}}：{indices}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.title": "{num, plural, other {# 个作业}}无法导入",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters": "缺失筛选{num, plural, one {列表} other {列表}}：{filters}",
"xpack.ml.importExport.importFlyout.cannotImportJobCallout.title": "{num, plural, one {# 个作业} other {# 个作业}}无法导入",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.body": "请选择包含已使用“导出作业”选项从 Kibana 导出的 Machine Learning 作业的文件",
"xpack.ml.importExport.importFlyout.cannotReadFileCallout.title": "无法读取文件",
"xpack.ml.importExport.importFlyout.closeButton": "关闭",
Expand Down Expand Up @@ -35825,7 +35824,7 @@
"xpack.securitySolution.appLinks.attackDiscovery": "Attack Discovery",
"xpack.securitySolution.appLinks.blocklistDescription": "阻止不需要的应用程序在您的主机上运行。",
"xpack.securitySolution.appLinks.category.cloudSecurity": "云安全",
"xpack.securitySolution.appLinks.category.discover": "Discover",
"xpack.securitySolution.appLinks.category.discover": "发现",
"xpack.securitySolution.appLinks.category.endpoints": "终端",
"xpack.securitySolution.appLinks.category.entityAnalytics": "实体分析",
"xpack.securitySolution.appLinks.category.investigations": "调查",
Expand Down
29 changes: 19 additions & 10 deletions ...plication/components/import_export_jobs/import_jobs_flyout/cannot_import_jobs_callout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,32 @@ const SkippedJobList: FC<{ jobs: SkippedJobs[] }> = ({ jobs }) => (
<>
{jobs.length > 0 && (
<>
{jobs.map(({ jobId, missingIndices, missingFilters }) => (
<EuiText size="s">
{jobs.map(({ jobId, missingFilters, sourceIndicesErrors }) => (
<EuiText size="xs" key={jobId}>
<h5>{jobId}</h5>
{missingIndices.length > 0 && (
<FormattedMessage
id="xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingIndex"
defaultMessage="Missing index {num, plural, one {pattern} other {patterns}}: {indices}"
values={{ num: missingIndices.length, indices: missingIndices.join(',') }}
/>
)}
{missingFilters.length > 0 && (
{missingFilters && missingFilters.length > 0 && (
<FormattedMessage
id="xpack.ml.importExport.importFlyout.cannotImportJobCallout.missingFilters"
defaultMessage="Missing filter {num, plural, one {list} other {lists}}: {filters}"
values={{ num: missingFilters.length, filters: missingFilters.join(',') }}
/>
)}
{sourceIndicesErrors && sourceIndicesErrors.length > 0 && (
<>
{sourceIndicesErrors.map(({ index, error }, i) => (
<FormattedMessage
key={`${jobId}-${index ?? 'undefined'}-${error}`}
id="xpack.ml.importExport.importFlyout.cannotImportJobCallout.sourceIndexValidationFailed"
defaultMessage="{index, select, undefined {Source indices validation failed} other {Source index validation failed for {index}}}{reason, select, undefined {} other { Reason: {reason}}}{br}"
values={{
index,
reason: error,
br: i < sourceIndicesErrors.length - 1 ? <br /> : '',
}}
/>
))}
</>
)}
</EuiText>
))}
</>
Expand Down
123 changes: 80 additions & 43 deletions ...ublic/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
EuiPanel,
EuiFormRow,
EuiFieldText,
EuiCallOut,
} from '@elastic/eui';

import { i18n } from '@kbn/i18n';
Expand All @@ -51,13 +52,12 @@ export interface Props {
export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) => {
const {
services: {
data: {
dataViews: { getTitles: getDataViewTitles },
},
notifications: { toasts },
mlServices: {
mlUsageCollection,
mlApi: {
validateDatafeedPreview,
esSearch,
jobs: { bulkCreateJobs },
dataFrameAnalytics: { createDataFrameAnalytics },
filters: { filters: getFilters },
Expand All @@ -66,7 +66,10 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) =>
},
} = useMlKibana();

const jobImportService = useMemo(() => new JobImportService(), []);
const jobImportService = useMemo(
() => new JobImportService(esSearch, validateDatafeedPreview, getFilters),
[esSearch, validateDatafeedPreview, getFilters]
);

const [showFlyout, setShowFlyout] = useState(false);
const [adJobs, setAdJobs] = useState<ImportedAdJob[]>([]);
Expand Down Expand Up @@ -143,9 +146,7 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) =>

const validatedJobs = await jobImportService.validateJobs(
loadedFile.jobs,
loadedFile.jobType,
getDataViewTitles,
getFilters
loadedFile.jobType
);

if (loadedFile.jobType === 'anomaly-detector') {
Expand All @@ -161,19 +162,25 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) =>
}

setJobType(loadedFile.jobType);

setJobIdObjects(
validatedJobs.jobs.map(({ jobId, destIndex }) => ({
jobId,
originalId: jobId,
jobIdValid: true,
jobIdInvalidMessage: '',
jobIdValidated: false,
destIndex,
originalDestIndex: destIndex,
destIndexValid: true,
destIndexInvalidMessage: '',
destIndexValidated: false,
}))
validatedJobs.jobs.map(({ jobId, destIndex }) => {
const datafeedValidation = validatedJobs.datafeedValidations.get(jobId);
return {
jobId,
originalId: jobId,
jobIdValid: true,
jobIdInvalidMessage: '',
jobIdValidated: false,
destIndex,
originalDestIndex: destIndex,
destIndexValid: true,
destIndexInvalidMessage: '',
destIndexValidated: false,
datafeedInvalid: datafeedValidation?.hasWarning,
datafeedWarningMessage: datafeedValidation?.warningMessage,
};
})
);

const ids = createIdsMash(validatedJobs.jobs as JobIdObject[], loadedFile.jobType);
Expand Down Expand Up @@ -375,6 +382,9 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) =>
hideCloseButton
size="m"
data-test-subj="mlJobMgmtImportJobsFlyout"
aria-label={i18n.translate('xpack.ml.importExport.importFlyout.flyoutAriaLabel', {
defaultMessage: 'Import jobs flyout',
})}
>
<EuiFlyoutHeader hasBorder>
<EuiTitle size="m">
Expand Down Expand Up @@ -469,32 +479,59 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled, onImportComplete }) =>
</EuiFormRow>

{jobType === 'data-frame-analytics' && (
<EuiFormRow
helpText={
jobId.destIndexValid === true ? jobId.destIndexInvalidMessage : ''
}
error={
jobId.destIndexValid === false
? jobId.destIndexInvalidMessage
: ''
}
isInvalid={jobId.destIndexValid === false}
>
<EuiFieldText
prepend={i18n.translate(
'xpack.ml.importExport.importFlyout.destIndex',
{
defaultMessage: 'Destination index',
}
)}
disabled={importing}
compressed={true}
value={jobId.destIndex}
onChange={(e) => renameDestIndex(e.target.value, i)}
<>
<EuiFormRow
helpText={
jobId.destIndexValid === true
? jobId.destIndexInvalidMessage
: ''
}
error={
jobId.destIndexValid === false
? jobId.destIndexInvalidMessage
: ''
}
isInvalid={jobId.destIndexValid === false}
/>
</EuiFormRow>
>
<EuiFieldText
prepend={i18n.translate(
'xpack.ml.importExport.importFlyout.destIndex',
{
defaultMessage: 'Destination index',
}
)}
disabled={importing}
compressed={true}
value={jobId.destIndex}
onChange={(e) => renameDestIndex(e.target.value, i)}
isInvalid={jobId.destIndexValid === false}
/>
</EuiFormRow>
</>
)}

{jobType === 'anomaly-detector' &&
jobId.datafeedInvalid === true &&
jobId.datafeedWarningMessage && (
<EuiFormRow>
<EuiCallOut
data-test-subj="mlJobImportJobDatafeedWarning"
title={i18n.translate(
'xpack.ml.importExport.importFlyout.datafeedWarning.title',
{
defaultMessage: 'Datafeed Warning',
}
)}
color="warning"
size="s"
announceOnMount
>
<EuiText size="xs" className="eui-textBreakWord">
{jobId.datafeedWarningMessage}
</EuiText>
</EuiCallOut>
</EuiFormRow>
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<DeleteJobButton index={i} />
Expand Down
Loading