Skip to content

[8.x] [Security Solution] Siem migrations copy changes in the upload flyout (#213975) #214281

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

Merged
semd merged 3 commits into from
Mar 13, 2025
Merged

[8.x] [Security Solution] Siem migrations copy changes in the upload flyout (#213975) #214281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5211831
[Security Solution] Siem migrations copy changes in the upload flyout…
semd Mar 12, 2025
6b8a474
remove unnecessary translations
semd Mar 13, 2025
83cb410
Merge branch '8.x' into backport/8.x/pr-213975
elasticmachine Mar 13, 2025
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
2 changes: 0 additions & 2 deletions 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 @@ -43902,10 +43902,8 @@
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.lookupsFileUpload.title": "Mettre à jour votre exportation de consultations",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.clearEmptyLookupTooltip": "Marquer la consultation comme vide",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.copyLookupNameTooltip": "Copier le nom de la consultation",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.description": "Pour vos consultations, rendez-vous sur votre compte admin Splunk et la page de consultation dans l'application Recherche et Rapports. Téléchargez les consultations suivantes individuellement, et chargez-les ci-dessous.",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.title": "Consultations trouvées dans vos règles",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.title": "Charger les consultations identifiées",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.description.section": "Recherche et Rapports",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.title": "Copier la requête de macros",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.prompt": "Sélectionnez ou faites un cliquer-glisser sur le fichier JSON exporté",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.title": "Mettez à jour votre exportation de macro",
Expand Down
2 changes: 0 additions & 2 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 @@ -43873,10 +43873,8 @@
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.lookupsFileUpload.title": "ルックアップエクスポートを更新",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.clearEmptyLookupTooltip": "ルックアップを空に設定",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.copyLookupNameTooltip": "ルックアップ名をコピー",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.description": "ルックアップの場合、Splunk管理者アカウントと、検索とレポートアプリのルックアップページに移動します。次のルックアップを個別にダウンロードし、以下の場所にアップロードしてください。",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.title": "ルールでルックアップが見つかりました",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.title": "特定されたルックアップをアップロード",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.description.section": "検索とレポート",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.title": "マクロクエリをコピー",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.prompt": "エクスポートされたJSONファイルを選択するか、ドラッグしてドロップします",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.title": "マクロエクスポートを更新",
Expand Down
2 changes: 0 additions & 2 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 @@ -43945,10 +43945,8 @@
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.lookupsFileUpload.title": "更新您导出的查找",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.clearEmptyLookupTooltip": "将查找标记为空",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.copyLookupNameTooltip": "复制查找名称",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.description": "对于您的查找，请前往您的 Splunk 管理员帐户以及搜索和报告应用查找页面。分别下载以下查找并在下方上传。",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.title": "在您的规则中找到查找",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.title": "上传识别的查找",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.description.section": "搜索和报告",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.title": "复制宏查询",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.prompt": "选择或拖放导出的 JSON 文件",
"xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.title": "更新您导出的宏",
Expand Down
2 changes: 1 addition & 1 deletion ...rding/components/onboarding_body/cards/siem_migrations/ai_connector/ai_connector_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const AIConnectorCard: OnboardingCardComponent<AIConnectorCardMetadata> =
{isInferenceConnector ? (
<FormattedMessage
id="xpack.securitySolution.onboarding.aiConnectorCardInferenceDescription"
defaultMessage="The Elastic-provided connector is selected by default. You can configure another connector and model if you prefer. Learn more about {docsLink} and performance with our {llmMatrixLink}"
defaultMessage="The Elastic-provided connector is selected by default. You can configure another connector and model if you prefer. Learn more about {docsLink} and {llmMatrixLink}"
values={{
llmMatrixLink: <LlmPerformanceMatrixDocsLink text={i18n.LLM_MATRIX_LINK} />,
docsLink: <SiemMigrationDocsLink text={i18n.AI_POWERED_MIGRATIONS_LINK} />,
Expand Down
2 changes: 1 addition & 1 deletion .../onboarding/components/onboarding_body/cards/siem_migrations/ai_connector/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const AI_CONNECTOR_CARD_DESCRIPTION_INFERENCE_CONNECTOR = i18n.translate(

export const LLM_MATRIX_LINK = i18n.translate(
'xpack.securitySolution.onboarding.aiConnector.llmMatrixLink',
{ defaultMessage: 'LLM performance matrix' }
{ defaultMessage: 'model performance' }
);

export const AI_POWERED_MIGRATIONS_LINK = i18n.translate(
Expand Down
2 changes: 1 addition & 1 deletion ..._solution/public/siem_migrations/rules/components/data_input_flyout/data_input_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const MigrationDataInputFlyout = React.memo<MigrationDataInputFlyoutProps
return (
<EuiFlyoutResizable
onClose={onClose}
size="m"
size={850}
maxWidth={1200}
minWidth={500}
data-test-subj="uploadRulesFlyout"
Expand Down
2 changes: 1 addition & 1 deletion ...nts/data_input_flyout/steps/lookups/sub_steps/lookups_file_upload/lookups_file_upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const LookupsFileUpload = React.memo<LookupsFileUploadProps>(
const isButtonDisabled = showLoader || lookupResources.length === 0;

return (
<EuiFlexGroup direction="column">
<EuiFlexGroup direction="column" gutterSize="s">
<EuiFlexItem>
<EuiFormRow
helpText={errors.map((error) => (
Expand Down
118 changes: 64 additions & 54 deletions ...s/data_input_flyout/steps/lookups/sub_steps/missing_lookups_list/missing_lookups_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import {
EuiFlexItem,
EuiIcon,
EuiPanel,
EuiSpacer,
EuiText,
EuiToolTip,
useEuiTheme,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import type { UploadedLookups } from '../../lookups_data_input';
import * as i18n from './translations';

Expand All @@ -37,60 +37,70 @@ export const MissingLookupsList = React.memo<MissingLookupsListProps>(
({ missingLookups, uploadedLookups, omitLookup, onCopied }) => {
const { euiTheme } = useEuiTheme();
return (
<>
<EuiPanel hasShadow={false} hasBorder className={scrollPanelCss}>
<EuiFlexGroup direction="column" gutterSize="s">
{missingLookups.map((lookupName) => {
const isOmitted = uploadedLookups[lookupName] === '';
return (
<EuiFlexItem key={lookupName}>
<EuiFlexGroup
direction="row"
gutterSize="s"
alignItems="center"
justifyContent="flexStart"
>
<EuiFlexItem grow={false}>
{uploadedLookups[lookupName] != null ? (
<EuiIcon type="checkInCircleFilled" color={euiTheme.colors.success} />
) : (
<EuiIcon type="dot" />
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText size="s" style={isOmitted ? { textDecoration: 'line-through' } : {}}>
{lookupName}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiCopy textToCopy={lookupName}>
{(copy) => (
<CopyLookupNameButton
lookupName={lookupName}
onCopied={onCopied}
copy={copy}
/>
<EuiFlexGroup direction="column" gutterSize="s">
<EuiFlexItem>
<EuiText size="s">
<FormattedMessage
id="xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.copyExportQuery.description"
defaultMessage="Log in to your Splunk admin account, go to the {app}, download the following lookups individually and upload them below. You can also omit lookups that are empty or not needed, and they will be ignored in the translation."
values={{ app: <b>{i18n.LOOKUPS_SPLUNK_APP}</b> }}
/>
</EuiText>
</EuiFlexItem>
<EuiFlexItem>
<EuiPanel hasShadow={false} hasBorder className={scrollPanelCss}>
<EuiFlexGroup direction="column" gutterSize="s">
{missingLookups.map((lookupName) => {
const isOmitted = uploadedLookups[lookupName] === '';
return (
<EuiFlexItem key={lookupName}>
<EuiFlexGroup
direction="row"
gutterSize="s"
alignItems="center"
justifyContent="flexStart"
>
<EuiFlexItem grow={false}>
{uploadedLookups[lookupName] != null ? (
<EuiIcon type="checkInCircleFilled" color={euiTheme.colors.success} />
) : (
<EuiIcon type="dot" />
)}
</EuiCopy>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<OmitLookupButton
lookupName={lookupName}
omitLookup={omitLookup}
isDisabled={isOmitted}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
);
})}
</EuiFlexGroup>
</EuiPanel>
<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
{i18n.MISSING_LOOKUPS_DESCRIPTION}
</EuiText>
</>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText
size="s"
style={isOmitted ? { textDecoration: 'line-through' } : {}}
>
{lookupName}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiCopy textToCopy={lookupName}>
{(copy) => (
<CopyLookupNameButton
lookupName={lookupName}
onCopied={onCopied}
copy={copy}
/>
)}
</EuiCopy>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<OmitLookupButton
lookupName={lookupName}
omitLookup={omitLookup}
isDisabled={isOmitted}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
);
})}
</EuiFlexGroup>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGroup>
);
}
);
Expand Down
9 changes: 3 additions & 6 deletions ...components/data_input_flyout/steps/lookups/sub_steps/missing_lookups_list/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ export const LOOKUPS_DATA_INPUT_COPY_TITLE = i18n.translate(
{ defaultMessage: 'Lookups found in your rules' }
);

export const MISSING_LOOKUPS_DESCRIPTION = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.description',
{
defaultMessage:
'For your lookups, go to your admin Splunk account and the Search and Reporting app Lookups page. Download the following lookups individually and upload below.',
}
export const LOOKUPS_SPLUNK_APP = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.missingLookupsList.appSection',
{ defaultMessage: 'Splunk App for Lookup File Editing' }
);

export const COPY_LOOKUP_NAME_TOOLTIP = i18n.translate(
Expand Down
2 changes: 1 addition & 1 deletion ...n/public/siem_migrations/rules/components/data_input_flyout/steps/lookups/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';

export const LOOKUPS_DATA_INPUT_TITLE = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.title',
{ defaultMessage: 'Upload identified lookups' }
{ defaultMessage: 'Upload lookups' }
);
export const LOOKUPS_DATA_INPUT_DESCRIPTION = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.lookups.description',
Expand Down
6 changes: 1 addition & 5 deletions ...tions/rules/components/data_input_flyout/steps/macros/sub_steps/check_resources/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ export const useCheckResourcesStep = ({
return {
title: i18n.RULES_DATA_INPUT_CHECK_RESOURCES_TITLE,
status: uploadStepStatus,
children: (
<EuiText size="xs" color="subdued">
{i18n.RULES_DATA_INPUT_CHECK_RESOURCES_DESCRIPTION}
</EuiText>
),
children: <EuiText size="s">{i18n.RULES_DATA_INPUT_CHECK_RESOURCES_DESCRIPTION}</EuiText>,
};
};
2 changes: 1 addition & 1 deletion ...rules/components/data_input_flyout/steps/macros/sub_steps/check_resources/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ export const RULES_DATA_INPUT_CHECK_RESOURCES_TITLE = i18n.translate(
export const RULES_DATA_INPUT_CHECK_RESOURCES_DESCRIPTION = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.rules.checkResources.description',
{
defaultMessage: `For best translation results, we will automatically review your rules for macros and lookups and ask you to upload them. Once uploaded, we'll be able to deliver a more complete rule translation for all rules using those macros or lookups.`,
defaultMessage: `For best translation results, we will review the data for macros and lookups. If found, we will ask you to upload them next.`,
}
);
47 changes: 25 additions & 22 deletions ...mponents/data_input_flyout/steps/macros/sub_steps/copy_export_query/copy_export_query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React, { useCallback } from 'react';
import { EuiCodeBlock, EuiSpacer, EuiText } from '@elastic/eui';
import { EuiCodeBlock, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { MACROS_SPLUNK_QUERY } from '../../../../constants';
import * as i18n from './translations';
Expand All @@ -26,28 +26,31 @@ export const CopyExportQuery = React.memo<CopyExportQueryProps>(({ onCopied }) =
);

return (
<>
{/* The click event is also dispatched when using the keyboard actions (space or enter) for "copy" button.
<EuiFlexGroup direction="column" gutterSize="s">
<EuiFlexItem>
<EuiText size="s">
<FormattedMessage
id="xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.description"
defaultMessage="From you admin Splunk account, go to the {section} app and run the above query. Export your results as {format}."
values={{
section: <b>{i18n.MACROS_DATA_INPUT_COPY_DESCRIPTION_SECTION}</b>,
format: <b>{'JSON'}</b>,
}}
/>
</EuiText>
</EuiFlexItem>
<EuiFlexItem>
{/* The click event is also dispatched when using the keyboard actions (space or enter) for "copy" button.
No need to use keyboard specific events, disabling the a11y lint rule:*/}
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
<div onClick={onClick}>
{/* onCopy react event is dispatched when the user copies text manually */}
<EuiCodeBlock language="text" fontSize="m" paddingSize="m" isCopyable onCopy={onCopied}>
{MACROS_SPLUNK_QUERY}
</EuiCodeBlock>
</div>
<EuiSpacer size="m" />
<EuiText size="s">
<FormattedMessage
id="xpack.securitySolution.siemMigrations.rules.dataInputFlyout.rules.copyExportQuery.description"
defaultMessage="From you admin Splunk account, go to the {section} app and run the above query. Export your results as {format}."
values={{
section: <b>{i18n.MACROS_DATA_INPUT_COPY_DESCRIPTION_SECTION}</b>,
format: <b>{'JSON'}</b>,
}}
/>
</EuiText>
</>
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events */}
<div onClick={onClick}>
{/* onCopy react event is dispatched when the user copies text manually */}
<EuiCodeBlock language="text" fontSize="m" paddingSize="m" isCopyable onCopy={onCopied}>
{MACROS_SPLUNK_QUERY}
</EuiCodeBlock>
</div>
</EuiFlexItem>
</EuiFlexGroup>
);
});
CopyExportQuery.displayName = 'CopyExportQuery';
4 changes: 2 additions & 2 deletions ...les/components/data_input_flyout/steps/macros/sub_steps/copy_export_query/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { i18n } from '@kbn/i18n';

export const MACROS_DATA_INPUT_COPY_TITLE = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.title',
{ defaultMessage: 'Copy macros query' }
{ defaultMessage: 'Export macros' }
);

export const MACROS_DATA_INPUT_COPY_DESCRIPTION_SECTION = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.description.section',
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.copyExportQuery.descriptionSection',
{ defaultMessage: 'Search and Reporting' }
);
2 changes: 1 addition & 1 deletion ...onents/data_input_flyout/steps/macros/sub_steps/macros_file_upload/macros_file_upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const MacrosFileUpload = React.memo<MacrosFileUploadProps>(
const isButtonDisabled = showLoader || macrosToUpload.length === 0;

return (
<EuiFlexGroup direction="column">
<EuiFlexGroup direction="column" gutterSize="s">
<EuiFlexItem>
<EuiFormRow
helpText={
Expand Down
2 changes: 1 addition & 1 deletion ...es/components/data_input_flyout/steps/macros/sub_steps/macros_file_upload/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';

export const MACROS_DATA_INPUT_FILE_UPLOAD_TITLE = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.title',
{ defaultMessage: 'Update your macros export' }
{ defaultMessage: 'Upload exported macros' }
);
export const MACROS_DATA_INPUT_FILE_UPLOAD_PROMPT = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.macrosFileUpload.prompt',
Expand Down
2 changes: 1 addition & 1 deletion ...on/public/siem_migrations/rules/components/data_input_flyout/steps/macros/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ import { i18n } from '@kbn/i18n';

export const MACROS_DATA_INPUT_TITLE = i18n.translate(
'xpack.securitySolution.siemMigrations.rules.dataInputFlyout.macros.title',
{ defaultMessage: 'Upload identified macros' }
{ defaultMessage: 'Upload macros' }
);
6 changes: 1 addition & 5 deletions ...ations/rules/components/data_input_flyout/steps/rules/sub_steps/check_resources/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ export const useCheckResourcesStep = ({
return {
title: i18n.RULES_DATA_INPUT_CHECK_RESOURCES_TITLE,
status: uploadStepStatus,
children: (
<EuiText size="xs" color="subdued">
{i18n.RULES_DATA_INPUT_CHECK_RESOURCES_DESCRIPTION}
</EuiText>
),
children: <EuiText size="s">{i18n.RULES_DATA_INPUT_CHECK_RESOURCES_DESCRIPTION}</EuiText>,
};
};
Loading