github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Rename ingestManager translations fleet (#81837)

Browse source
This commit is contained in:
Nicolas Chaulet 2020-10-28 08:27:20 -04:00 • committed by GitHub
parent 756c3f16e3
commit 415a90fb69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
91 changed files with 1828 additions and 1977 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/.i18nrc.json
View file

@ -27,7 +27,7 @@
"xpack.idxMgmt": "plugins/index_management",
"xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
"xpack.infra": "plugins/infra",
"xpack.ingestManager": "plugins/ingest_manager",
"xpack.fleet": "plugins/ingest_manager",
"xpack.ingestPipelines": "plugins/ingest_pipelines",
"xpack.lens": "plugins/lens",
"xpack.licenseMgmt": "plugins/license_management",
@ -56,9 +56,7 @@
"xpack.watcher": "plugins/watcher",
"xpack.observability": "plugins/observability"
},
"exclude": [
"examples"
],
"exclude": ["examples"],
"translations": [
"plugins/translations/translations/zh-CN.json",
"plugins/translations/translations/ja-JP.json"

15
x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts
View file

@ -12,26 +12,23 @@ export function isValidNamespace(namespace: string): { valid: boolean; error?: s
if (!namespace.trim()) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.requiredErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.requiredErrorMessage', {
defaultMessage: 'Namespace is required',
}),
};
} else if (namespace !== namespace.toLowerCase()) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.lowercaseErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.lowercaseErrorMessage', {
defaultMessage: 'Namespace must be lowercase',
}),
};
} else if (/[\*\\/\?"<>|\s,#:]+/.test(namespace)) {
return {
valid: false,
error: i18n.translate(
'xpack.ingestManager.namespaceValidation.invalidCharactersErrorMessage',
{
defaultMessage: 'Namespace contains invalid characters',
}
),
error: i18n.translate('xpack.fleet.namespaceValidation.invalidCharactersErrorMessage', {
defaultMessage: 'Namespace contains invalid characters',
}),
};
}
// Node.js doesn't have Blob, and browser doesn't have Buffer :)
@ -41,7 +38,7 @@ export function isValidNamespace(namespace: string): { valid: boolean; error?: s
) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.tooLongErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.tooLongErrorMessage', {
defaultMessage: 'Namespace cannot be more than 100 bytes',
}),
};

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
View file

@ -27,7 +27,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="m">
<h2 id="AlphaMessagingFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.flyoutTitle"
id="xpack.fleet.alphaMessaging.flyoutTitle"
defaultMessage="About this release"
/>
</h2>
@ -37,13 +37,13 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiText size="m">
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.introText"
id="xpack.fleet.alphaMessaging.introText"
defaultMessage="Fleet is under active development and is not intended for use in production environments. This beta release is designed for users to test and offer feedback about Fleet and the new Elastic Agent. This plugin is not subject to the support SLA."
/>
</p>
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.feedbackText"
id="xpack.fleet.alphaMessaging.feedbackText"
defaultMessage="Read our {docsLink} or go to our {forumLink} for questions or feedback."
values={{
docsLink: (
@ -53,7 +53,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
target="_blank"
>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.docsLink"
id="xpack.fleet.alphaMessaging.docsLink"
defaultMessage="documentation"
/>
</EuiLink>
@ -61,7 +61,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
forumLink: (
<EuiLink href="https://ela.st/ingest-manager-forum" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.forumLink"
id="xpack.fleet.alphaMessaging.forumLink"
defaultMessage="Discuss forum"
/>
</EuiLink>
@ -74,7 +74,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiFlyoutFooter>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.alphaMessging.closeFlyoutLabel"
id="xpack.fleet.alphaMessging.closeFlyoutLabel"
defaultMessage="Close"
/>
</EuiButtonEmpty>

9
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
View file

@ -26,20 +26,17 @@ export const AlphaMessaging: React.FC<{}> = () => {
<Message>
<p>
<strong>
<FormattedMessage
id="xpack.ingestManager.alphaMessageTitle"
defaultMessage="Beta release"
/>
<FormattedMessage id="xpack.fleet.alphaMessageTitle" defaultMessage="Beta release" />
</strong>
{' – '}
<FormattedMessage
id="xpack.ingestManager.alphaMessageDescription"
id="xpack.fleet.alphaMessageDescription"
defaultMessage="Fleet is not
recommended for production environments."
/>{' '}
<EuiLink color="subdued" onClick={() => setIsAlphaFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.alphaMessageLinkText"
id="xpack.fleet.alphaMessageLinkText"
defaultMessage="See more details."
/>
</EuiLink>

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/context_menu_actions.tsx
View file

@ -63,7 +63,7 @@ export const ContextMenuActions = React.memo<Props>(({ button, onChange, isOpen,
<EuiButtonIcon
iconType="boxesHorizontal"
onClick={handleToggleMenu}
aria-label={i18n.translate('xpack.ingestManager.genericActionsMenuText', {
aria-label={i18n.translate('xpack.fleet.genericActionsMenuText', {
defaultMessage: 'Open',
})}
/>

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
View file

@ -38,7 +38,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.descriptionText"
id="xpack.fleet.enrollmentInstructions.descriptionText"
defaultMessage="From the agent directory, run the appropriate command to install, enroll, and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
/>
</EuiText>
@ -46,7 +46,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<EuiTitle size="xs">
<h4>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.linuxMacOSTitle"
id="xpack.fleet.enrollmentInstructions.linuxMacOSTitle"
defaultMessage="Linux, macOS"
/>
</h4>
@ -59,7 +59,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<EuiTitle size="xs">
<h4>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.windowsTitle"
id="xpack.fleet.enrollmentInstructions.windowsTitle"
defaultMessage="Windows"
/>
</h4>
@ -71,7 +71,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<EuiSpacer size="l" />
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.moreInstructionsText"
id="xpack.fleet.enrollmentInstructions.moreInstructionsText"
defaultMessage="See the {link} for more instructions and options."
values={{
link: (
@ -81,7 +81,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
href="https://www.elastic.co/guide/en/ingest-management/current/elastic-agent-installation-configuration.html"
>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.moreInstructionsLink"
id="xpack.fleet.enrollmentInstructions.moreInstructionsLink"
defaultMessage="Elastic Agent docs"
/>
</EuiLink>

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_header_link.tsx
View file

@ -33,7 +33,7 @@ const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo((
return hasIngestManager && noticeState.settingsDataLoaded && noticeState.hasSeenNotice ? (
<EuiButtonEmpty size="s" iconType="link" flush="right" href={getHref('overview')}>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.fleetAppButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.fleetAppButtonText"
defaultMessage="Try Fleet Beta"
/>
</EuiButtonEmpty>

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
View file

@ -60,13 +60,13 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
iconType="cheer"
title={
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeTitle"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeTitle"
defaultMessage="{newPrefix} Elastic Agent and Fleet Beta"
values={{
newPrefix: (
<strong>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeTitle.newPrefix"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeTitle.newPrefix"
defaultMessage="New:"
/>
</strong>
@ -77,7 +77,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
>
<p>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeText"
defaultMessage="The Elastic Agent provides a simple, unified way to add monitoring for logs, metrics, and other types of data to your hosts.
You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy policies across your infrastructure.
For more information, read our {blogPostLink}."
@ -85,7 +85,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
blogPostLink: (
<EuiLink href="https://ela.st/ingest-manager-announcement" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText.blogPostLink"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeText.blogPostLink"
defaultMessage="announcement blog post"
/>
</EuiLink>
@ -98,7 +98,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
<div>
<EuiButton size="s" href={getHref('overview')}>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.fleetAppButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.fleetAppButtonText"
defaultMessage="Try Fleet Beta"
/>
</EuiButton>
@ -113,7 +113,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
}}
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.dismissNoticeButtonText"
defaultMessage="Dismiss message"
/>
</EuiButtonEmpty>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
View file

@ -26,14 +26,14 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
<EuiText>
<p>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText"
defaultMessage="{notePrefix} a newer version of this module is {availableAsIntegrationLink} in Fleet Beta.
To learn more about agent policies and the new Elastic Agent, read our {blogPostLink}."
values={{
notePrefix: (
<strong>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.notePrefix"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix"
defaultMessage="Note:"
/>
</strong>
@ -45,7 +45,7 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
})}
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.integrationLink"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.integrationLink"
defaultMessage="available as an Integration"
/>
</EuiLink>
@ -57,7 +57,7 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
target="_blank"
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.blogPostLink"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.blogPostLink"
defaultMessage="announcement blog post"
/>
</EuiLink>

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/search_bar.tsx
View file

@ -61,7 +61,7 @@ export const SearchBar: React.FunctionComponent<Props> = ({
icon={'search'}
placeholder={
placeholder ||
i18n.translate('xpack.ingestManager.defaultSearchPlaceholderText', {
i18n.translate('xpack.fleet.defaultSearchPlaceholderText', {
defaultMessage: 'Search',
})
}

56
x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
View file

@ -41,21 +41,21 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
const kibanaUrlsInput = useComboInput([], (value) => {
if (value.length === 0) {
return [
i18n.translate('xpack.ingestManager.settings.kibanaUrlEmptyError', {
i18n.translate('xpack.fleet.settings.kibanaUrlEmptyError', {
defaultMessage: 'At least one URL is required',
}),
];
}
if (value.some((v) => !v.match(URL_REGEX))) {
return [
i18n.translate('xpack.ingestManager.settings.kibanaUrlError', {
i18n.translate('xpack.fleet.settings.kibanaUrlError', {
defaultMessage: 'Invalid URL',
}),
];
}
if (isDiffPathProtocol(value)) {
return [
i18n.translate('xpack.ingestManager.settings.kibanaUrlDifferentPathOrProtocolError', {
i18n.translate('xpack.fleet.settings.kibanaUrlDifferentPathOrProtocolError', {
defaultMessage: 'Protocol and path must be the same for each URL',
}),
];
@ -64,7 +64,7 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
const elasticsearchUrlInput = useComboInput([], (value) => {
if (value.some((v) => !v.match(URL_REGEX))) {
return [
i18n.translate('xpack.ingestManager.settings.elasticHostError', {
i18n.translate('xpack.fleet.settings.elasticHostError', {
defaultMessage: 'Invalid URL',
}),
];
@ -77,7 +77,7 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
return;
} catch (error) {
return [
i18n.translate('xpack.ingestManager.settings.invalidYamlFormatErrorMessage', {
i18n.translate('xpack.fleet.settings.invalidYamlFormatErrorMessage', {
defaultMessage: 'Invalid YAML: {reason}',
values: { reason: error.message },
}),
@ -114,7 +114,7 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
throw settingsResponse.error;
}
notifications.toasts.addSuccess(
i18n.translate('xpack.ingestManager.settings.success.message', {
i18n.translate('xpack.fleet.settings.success.message', {
defaultMessage: 'Settings saved',
})
);
@ -166,7 +166,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
options={[
{
id: 'enabled',
label: i18n.translate('xpack.ingestManager.settings.autoUpgradeEnabledLabel', {
label: i18n.translate('xpack.fleet.settings.autoUpgradeEnabledLabel', {
defaultMessage:
'Automatically update agent binaries to use the latest minor version.',
}),
@ -174,7 +174,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
{
id: 'disabled',
disabled: true,
label: i18n.translate('xpack.ingestManager.settings.autoUpgradeDisabledLabel', {
label: i18n.translate('xpack.fleet.settings.autoUpgradeDisabledLabel', {
defaultMessage:
'Manually manage agent binary versions. Requires a Gold subscription.',
}),
@ -187,7 +187,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="xs">
<h3>
<FormattedMessage
id="xpack.ingestManager.settings.autoUpgradeFieldLabel"
id="xpack.fleet.settings.autoUpgradeFieldLabel"
defaultMessage="Elastic Agent binary version"
/>
</h3>
@ -200,23 +200,17 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
options={[
{
id: 'enabled',
label: i18n.translate(
'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
{
defaultMessage:
'Automatically update integrations to the latest version to get the latest assets. You might need to update agent policies to use new features.',
}
),
label: i18n.translate('xpack.fleet.settings.integrationUpgradeEnabledFieldLabel', {
defaultMessage:
'Automatically update integrations to the latest version to get the latest assets. You might need to update agent policies to use new features.',
}),
},
{
id: 'disabled',
disabled: true,
label: i18n.translate(
'xpack.ingestManager.settings.integrationUpgradeDisabledFieldLabel',
{
defaultMessage: 'Manually manage integration versions yourself.',
}
),
label: i18n.translate('xpack.fleet.settings.integrationUpgradeDisabledFieldLabel', {
defaultMessage: 'Manually manage integration versions yourself.',
}),
},
]}
idSelected={'enabled'}
@ -226,7 +220,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="xs">
<h3>
<FormattedMessage
id="xpack.ingestManager.settings.integrationUpgradeFieldLabel"
id="xpack.fleet.settings.integrationUpgradeFieldLabel"
defaultMessage="Integration version"
/>
</h3>
@ -238,7 +232,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="s">
<h3>
<FormattedMessage
id="xpack.ingestManager.settings.globalOutputTitle"
id="xpack.fleet.settings.globalOutputTitle"
defaultMessage="Global output"
/>
</h3>
@ -246,14 +240,14 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiSpacer size="s" />
<EuiText color="subdued" size="s">
<FormattedMessage
id="xpack.ingestManager.settings.globalOutputDescription"
id="xpack.fleet.settings.globalOutputDescription"
defaultMessage="Specify where to send data. These settings are applied to all Elastic Agent policies."
/>
</EuiText>
<EuiSpacer size="m" />
<EuiFormRow>
<EuiFormRow
label={i18n.translate('xpack.ingestManager.settings.kibanaUrlLabel', {
label={i18n.translate('xpack.fleet.settings.kibanaUrlLabel', {
defaultMessage: 'Kibana URL',
})}
{...inputs.kibanaUrls.formRowProps}
@ -264,7 +258,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiSpacer size="m" />
<EuiFormRow>
<EuiFormRow
label={i18n.translate('xpack.ingestManager.settings.elasticsearchUrlLabel', {
label={i18n.translate('xpack.fleet.settings.elasticsearchUrlLabel', {
defaultMessage: 'Elasticsearch URL',
})}
{...inputs.elasticsearchUrl.formRowProps}
@ -276,7 +270,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiFormRow fullWidth>
<EuiFormRow
{...inputs.additionalYamlConfig.formRowProps}
label={i18n.translate('xpack.ingestManager.settings.additionalYamlConfig', {
label={i18n.translate('xpack.fleet.settings.additionalYamlConfig', {
defaultMessage: 'Elasticsearch output configuration',
})}
fullWidth={true}
@ -305,7 +299,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="m">
<h2 id="IngestManagerSettingsFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.settings.flyoutTitle"
id="xpack.fleet.settings.flyoutTitle"
defaultMessage="Fleet settings"
/>
</h2>
@ -317,7 +311,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.settings.cancelButtonLabel"
id="xpack.fleet.settings.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -325,7 +319,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiFlexItem grow={false}>
<EuiButton onClick={onSubmit} iconType="save" isLoading={isLoading}>
<FormattedMessage
id="xpack.ingestManager.settings.saveButtonLabel"
id="xpack.fleet.settings.saveButtonLabel"
defaultMessage="Save settings"
/>
</EuiButton>

46
x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_breadcrumbs.tsx
View file

@ -10,7 +10,7 @@ import { useCore } from './use_core';
const BASE_BREADCRUMB: ChromeBreadcrumb = {
href: pagePathGetters.overview(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.appTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.appTitle', {
defaultMessage: 'Fleet',
}),
};
@ -22,7 +22,7 @@ const breadcrumbGetters: {
overview: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.overviewPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.overviewPageTitle', {
defaultMessage: 'Overview',
}),
},
@ -30,7 +30,7 @@ const breadcrumbGetters: {
integrations: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.integrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
@ -39,12 +39,12 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.integrations(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.integrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.allIntegrationsPageTitle', {
defaultMessage: 'All',
}),
},
@ -53,12 +53,12 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.integrations(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.integrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.installedIntegrationsPageTitle', {
defaultMessage: 'Installed',
}),
},
@ -67,7 +67,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.integrations(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.integrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
@ -76,7 +76,7 @@ const breadcrumbGetters: {
policies: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Policies',
}),
},
@ -84,7 +84,7 @@ const breadcrumbGetters: {
policies_list: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Policies',
}),
},
@ -93,7 +93,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.policies(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Policies',
}),
},
@ -103,7 +103,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.policies(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Policies',
}),
},
@ -112,7 +112,7 @@ const breadcrumbGetters: {
text: policyName,
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.addPackagePolicyPageTitle', {
defaultMessage: 'Add integration',
}),
},
@ -121,7 +121,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.integrations(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.integrationsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
@ -130,7 +130,7 @@ const breadcrumbGetters: {
text: pkgTitle,
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.addPackagePolicyPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.addPackagePolicyPageTitle', {
defaultMessage: 'Add integration',
}),
},
@ -139,7 +139,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.policies(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.policiesPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
defaultMessage: 'Policies',
}),
},
@ -148,7 +148,7 @@ const breadcrumbGetters: {
text: policyName,
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.editPackagePolicyPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.editPackagePolicyPageTitle', {
defaultMessage: 'Edit integration',
}),
},
@ -156,7 +156,7 @@ const breadcrumbGetters: {
fleet: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
@ -164,7 +164,7 @@ const breadcrumbGetters: {
fleet_agent_list: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
@ -173,7 +173,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.fleet(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
@ -183,12 +183,12 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.fleet(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.enrollmentTokensPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.enrollmentTokensPageTitle', {
defaultMessage: 'Enrollment tokens',
}),
},
@ -196,7 +196,7 @@ const breadcrumbGetters: {
data_streams: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.datastreamsPageTitle', {
text: i18n.translate('xpack.fleet.breadcrumbs.datastreamsPageTitle', {
defaultMessage: 'Data streams',
}),
},

21
x-pack/plugins/ingest_manager/public/applications/ingest_manager/index.tsx
View file

@ -115,16 +115,13 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
<Error
title={
<FormattedMessage
id="xpack.ingestManager.permissionsRequestErrorMessageTitle"
id="xpack.fleet.permissionsRequestErrorMessageTitle"
defaultMessage="Unable to check permissions"
/>
}
error={i18n.translate(
'xpack.ingestManager.permissionsRequestErrorMessageDescription',
{
defaultMessage: 'There was a problem checking Fleet permissions',
}
)}
error={i18n.translate('xpack.fleet.permissionsRequestErrorMessageDescription', {
defaultMessage: 'There was a problem checking Fleet permissions',
})}
/>
) : (
<Panel>
@ -134,12 +131,12 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
<h2>
{permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
<FormattedMessage
id="xpack.ingestManager.permissionDeniedErrorTitle"
id="xpack.fleet.permissionDeniedErrorTitle"
defaultMessage="Permission denied"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.securityRequiredErrorTitle"
id="xpack.fleet.securityRequiredErrorTitle"
defaultMessage="Security is not enabled"
/>
)}
@ -149,13 +146,13 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
<p>
{permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
<FormattedMessage
id="xpack.ingestManager.permissionDeniedErrorMessage"
id="xpack.fleet.permissionDeniedErrorMessage"
defaultMessage="You are not authorized to access Fleet. Fleet requires {roleName} privileges."
values={{ roleName: <EuiCode>superuser</EuiCode> }}
/>
) : (
<FormattedMessage
id="xpack.ingestManager.securityRequiredErrorMessage"
id="xpack.fleet.securityRequiredErrorMessage"
defaultMessage="You must enable security in Kibana and Elasticsearch to use Fleet."
/>
)}
@ -175,7 +172,7 @@ const IngestManagerRoutes = memo<{ history: AppMountParameters['history']; basep
<Error
title={
<FormattedMessage
id="xpack.ingestManager.initializationErrorMessageTitle"
id="xpack.fleet.initializationErrorMessageTitle"
defaultMessage="Unable to initialize Fleet"
/>
}

14
x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
View file

@ -63,19 +63,19 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
<EuiTabs display="condensed">
<EuiTab isSelected={section === 'overview'} href={getHref('overview')}>
<FormattedMessage
id="xpack.ingestManager.appNavigation.overviewLinkText"
id="xpack.fleet.appNavigation.overviewLinkText"
defaultMessage="Overview"
/>
</EuiTab>
<EuiTab isSelected={section === 'epm'} href={getHref('integrations_all')}>
<FormattedMessage
id="xpack.ingestManager.appNavigation.epmLinkText"
id="xpack.fleet.appNavigation.epmLinkText"
defaultMessage="Integrations"
/>
</EuiTab>
<EuiTab isSelected={section === 'agent_policy'} href={getHref('policies_list')}>
<FormattedMessage
id="xpack.ingestManager.appNavigation.policiesLinkText"
id="xpack.fleet.appNavigation.policiesLinkText"
defaultMessage="Policies"
/>
</EuiTab>
@ -85,13 +85,13 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
disabled={!agents?.enabled}
>
<FormattedMessage
id="xpack.ingestManager.appNavigation.agentsLinkText"
id="xpack.fleet.appNavigation.agentsLinkText"
defaultMessage="Agents"
/>
</EuiTab>
<EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>
<FormattedMessage
id="xpack.ingestManager.appNavigation.dataStreamsLinkText"
id="xpack.fleet.appNavigation.dataStreamsLinkText"
defaultMessage="Data streams"
/>
</EuiTab>
@ -106,7 +106,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
target="_blank"
>
<FormattedMessage
id="xpack.ingestManager.appNavigation.sendFeedbackButton"
id="xpack.fleet.appNavigation.sendFeedbackButton"
defaultMessage="Send feedback"
/>
</EuiButtonEmpty>
@ -115,7 +115,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
<EuiFlexItem>
<EuiButtonEmpty iconType="gear" onClick={() => setIsSettingsFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.appNavigation.settingsButton"
id="xpack.fleet.appNavigation.settingsButton"
defaultMessage="Settings"
/>
</EuiButtonEmpty>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/actions_menu.tsx
View file

@ -69,7 +69,7 @@ export const AgentPolicyActionMenu = memo<{
},
children: (
<FormattedMessage
id="xpack.ingestManager.agentPolicyActionMenu.buttonText"
id="xpack.fleet.agentPolicyActionMenu.buttonText"
defaultMessage="Actions"
/>
),
@ -84,7 +84,7 @@ export const AgentPolicyActionMenu = memo<{
key="enrollAgents"
>
<FormattedMessage
id="xpack.ingestManager.agentPolicyActionMenu.enrollAgentActionText"
id="xpack.fleet.agentPolicyActionMenu.enrollAgentActionText"
defaultMessage="Add agent"
/>
</EuiContextMenuItem>,
@ -94,7 +94,7 @@ export const AgentPolicyActionMenu = memo<{
key="viewPolicy"
>
<FormattedMessage
id="xpack.ingestManager.agentPolicyActionMenu.viewPolicyText"
id="xpack.fleet.agentPolicyActionMenu.viewPolicyText"
defaultMessage="View policy"
/>
</EuiContextMenuItem>,
@ -107,7 +107,7 @@ export const AgentPolicyActionMenu = memo<{
key="copyPolicy"
>
<FormattedMessage
id="xpack.ingestManager.agentPolicyActionMenu.copyPolicyActionText"
id="xpack.fleet.agentPolicyActionMenu.copyPolicyActionText"
defaultMessage="Copy policy"
/>
</EuiContextMenuItem>,

29
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
View file

@ -37,13 +37,10 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
setIsModalOpen(true);
setAgentPolicy(agentPolicyToCopy);
setNewAgentPolicy({
name: i18n.translate(
'xpack.ingestManager.copyAgentPolicy.confirmModal.defaultNewPolicyName',
{
defaultMessage: '{name} (copy)',
values: { name: agentPolicyToCopy.name },
}
),
name: i18n.translate('xpack.fleet.copyAgentPolicy.confirmModal.defaultNewPolicyName', {
defaultMessage: '{name} (copy)',
values: { name: agentPolicyToCopy.name },
}),
description: agentPolicyToCopy.description,
});
onSuccessCallback.current = onSuccess;
@ -63,7 +60,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
if (data) {
notifications.toasts.addSuccess(
i18n.translate('xpack.ingestManager.copyAgentPolicy.successNotificationTitle', {
i18n.translate('xpack.fleet.copyAgentPolicy.successNotificationTitle', {
defaultMessage: 'Agent policy copied',
})
);
@ -72,7 +69,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
}
} else {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.copyAgentPolicy.failureNotificationTitle', {
i18n.translate('xpack.fleet.copyAgentPolicy.failureNotificationTitle', {
defaultMessage: "Error copying agent policy '{id}'",
values: { id: agentPolicy!.id },
})
@ -80,7 +77,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
}
} catch (e) {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.copyAgentPolicy.fatalErrorNotificationTitle', {
i18n.translate('xpack.fleet.copyAgentPolicy.fatalErrorNotificationTitle', {
defaultMessage: 'Error copying agent policy',
})
);
@ -99,7 +96,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
title={
<span className="eui-textBreakWord">
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyTitle"
id="xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyTitle"
defaultMessage="Copy '{name}' agent policy"
values={{
name: agentPolicy.name,
@ -111,13 +108,13 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
onConfirm={copyAgentPolicy}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.cancelButtonLabel"
id="xpack.fleet.copyAgentPolicy.confirmModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.confirmButtonLabel"
id="xpack.fleet.copyAgentPolicy.confirmModal.confirmButtonLabel"
defaultMessage="Copy policy"
/>
}
@ -125,14 +122,14 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
>
<p>
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.copyPolicyPrompt"
id="xpack.fleet.copyAgentPolicy.confirmModal.copyPolicyPrompt"
defaultMessage="Choose a name and description for your new agent policy."
/>
</p>
<EuiFormRow
label={
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.newNameLabel"
id="xpack.fleet.copyAgentPolicy.confirmModal.newNameLabel"
defaultMessage="New policy name"
/>
}
@ -147,7 +144,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
<EuiFormRow
label={
<FormattedMessage
id="xpack.ingestManager.copyAgentPolicy.confirmModal.newDescriptionLabel"
id="xpack.fleet.copyAgentPolicy.confirmModal.newDescriptionLabel"
defaultMessage="Description"
/>
}

22
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
View file

@ -61,7 +61,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
if (data) {
notifications.toasts.addSuccess(
i18n.translate('xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle', {
i18n.translate('xpack.fleet.deleteAgentPolicy.successSingleNotificationTitle', {
defaultMessage: "Deleted agent policy '{id}'",
values: { id: data.name || data.id },
})
@ -71,7 +71,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
}
} else {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle', {
i18n.translate('xpack.fleet.deleteAgentPolicy.failureSingleNotificationTitle', {
defaultMessage: "Error deleting agent policy '{id}'",
values: { id: agentPolicy },
})
@ -79,7 +79,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
}
} catch (e) {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.deleteAgentPolicy.fatalErrorNotificationTitle', {
i18n.translate('xpack.fleet.deleteAgentPolicy.fatalErrorNotificationTitle', {
defaultMessage: 'Error deleting agent policy',
})
);
@ -113,7 +113,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.deletePolicyTitle"
id="xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle"
defaultMessage="Delete this agent policy?"
/>
}
@ -121,19 +121,19 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
onConfirm={deleteAgentPolicy}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.cancelButtonLabel"
id="xpack.fleet.deleteAgentPolicy.confirmModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
isLoading || isLoadingAgentsCount ? (
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingButtonLabel"
id="xpack.fleet.deleteAgentPolicy.confirmModal.loadingButtonLabel"
defaultMessage="Loading…"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.confirmButtonLabel"
id="xpack.fleet.deleteAgentPolicy.confirmModal.confirmButtonLabel"
defaultMessage="Delete policy"
/>
)
@ -143,21 +143,21 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
>
{isLoadingAgentsCount ? (
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage"
id="xpack.fleet.deleteAgentPolicy.confirmModal.loadingAgentsCountMessage"
defaultMessage="Checking amount of affected agents…"
/>
) : agentsCount ? (
<EuiCallOut
color="danger"
title={i18n.translate(
'xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsTitle',
'xpack.fleet.deleteAgentPolicy.confirmModal.affectedAgentsTitle',
{
defaultMessage: 'Policy in use',
}
)}
>
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.affectedAgentsMessage"
id="xpack.fleet.deleteAgentPolicy.confirmModal.affectedAgentsMessage"
defaultMessage="{agentsCount, plural, one {# agent is} other {# agents are}} assigned to this agent policy. Unassign these agents before deleting this policy."
values={{
agentsCount,
@ -166,7 +166,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
</EuiCallOut>
) : (
<FormattedMessage
id="xpack.ingestManager.deleteAgentPolicy.confirmModal.irreversibleMessage"
id="xpack.fleet.deleteAgentPolicy.confirmModal.irreversibleMessage"
defaultMessage="This action cannot be undone."
/>
)}

56
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_form.tsx
View file

@ -46,7 +46,7 @@ export const agentPolicyFormValidation = (
if (!agentPolicy.name?.trim()) {
errors.name = [
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.nameRequiredErrorMessage"
id="xpack.fleet.agentPolicyForm.nameRequiredErrorMessage"
defaultMessage="Agent policy name is required"
/>,
];
@ -88,12 +88,9 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
{
name: 'name',
label: (
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.nameFieldLabel"
defaultMessage="Name"
/>
<FormattedMessage id="xpack.fleet.agentPolicyForm.nameFieldLabel" defaultMessage="Name" />
),
placeholder: i18n.translate('xpack.ingestManager.agentPolicyForm.nameFieldPlaceholder', {
placeholder: i18n.translate('xpack.fleet.agentPolicyForm.nameFieldPlaceholder', {
defaultMessage: 'Choose a name',
}),
},
@ -101,16 +98,13 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
name: 'description',
label: (
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.descriptionFieldLabel"
id="xpack.fleet.agentPolicyForm.descriptionFieldLabel"
defaultMessage="Description"
/>
),
placeholder: i18n.translate(
'xpack.ingestManager.agentPolicyForm.descriptionFieldPlaceholder',
{
defaultMessage: 'How will this policy be used?',
}
),
placeholder: i18n.translate('xpack.fleet.agentPolicyForm.descriptionFieldPlaceholder', {
defaultMessage: 'How will this policy be used?',
}),
},
];
}, []);
@ -120,14 +114,14 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
title={
<h4>
<FormattedMessage
id="xpack.ingestManager.policyForm.generalSettingsGroupTitle"
id="xpack.fleet.policyForm.generalSettingsGroupTitle"
defaultMessage="General settings"
/>
</h4>
}
description={
<FormattedMessage
id="xpack.ingestManager.policyForm.generalSettingsGroupDescription"
id="xpack.fleet.policyForm.generalSettingsGroupDescription"
defaultMessage="Choose a name and description for your agent policy."
/>
}
@ -163,14 +157,14 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
title={
<h4>
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.namespaceFieldLabel"
id="xpack.fleet.agentPolicyForm.namespaceFieldLabel"
defaultMessage="Default namespace"
/>
</h4>
}
description={
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.namespaceFieldDescription"
id="xpack.fleet.agentPolicyForm.namespaceFieldDescription"
defaultMessage="Apply a default namespace to integrations that use this policy. Integrations can specify their own namespaces."
/>
}
@ -202,14 +196,14 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
title={
<h4>
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.monitoringLabel"
id="xpack.fleet.agentPolicyForm.monitoringLabel"
defaultMessage="Agent monitoring"
/>
</h4>
}
description={
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.monitoringDescription"
id="xpack.fleet.agentPolicyForm.monitoringDescription"
defaultMessage="Collect data about your agents for debugging and tracking performance."
/>
}
@ -221,12 +215,12 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
label: (
<>
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.monitoringLogsFieldLabel"
id="xpack.fleet.agentPolicyForm.monitoringLogsFieldLabel"
defaultMessage="Collect agent logs"
/>{' '}
<EuiIconTip
content={i18n.translate(
'xpack.ingestManager.agentPolicyForm.monitoringLogsTooltipText',
'xpack.fleet.agentPolicyForm.monitoringLogsTooltipText',
{
defaultMessage: 'Collect logs from Elastic Agents that use this policy.',
}
@ -243,12 +237,12 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
label: (
<>
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.monitoringMetricsFieldLabel"
id="xpack.fleet.agentPolicyForm.monitoringMetricsFieldLabel"
defaultMessage="Collect agent metrics"
/>{' '}
<EuiIconTip
content={i18n.translate(
'xpack.ingestManager.agentPolicyForm.monitoringMetricsTooltipText',
'xpack.fleet.agentPolicyForm.monitoringMetricsTooltipText',
{
defaultMessage: 'Collect metrics from Elastic Agents that use this policy.',
}
@ -290,7 +284,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
title={
<h4>
<FormattedMessage
id="xpack.ingestManager.policyForm.deletePolicyGroupTitle"
id="xpack.fleet.policyForm.deletePolicyGroupTitle"
defaultMessage="Delete policy"
/>
</h4>
@ -298,7 +292,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
description={
<>
<FormattedMessage
id="xpack.ingestManager.policyForm.deletePolicyGroupDescription"
id="xpack.fleet.policyForm.deletePolicyGroupDescription"
defaultMessage="Existing data will not be deleted."
/>
<EuiSpacer size="s" />
@ -311,7 +305,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
onClick={() => deleteAgentPolicyPrompt(agentPolicy.id!, onDelete)}
>
<FormattedMessage
id="xpack.ingestManager.policyForm.deletePolicyActionText"
id="xpack.fleet.policyForm.deletePolicyActionText"
defaultMessage="Delete policy"
/>
</EuiButton>
@ -323,7 +317,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
<EuiSpacer size="xs" />
<EuiText color="subdued" size="xs">
<FormattedMessage
id="xpack.ingestManager.policyForm.unableToDeleteDefaultPolicyText"
id="xpack.fleet.policyForm.unableToDeleteDefaultPolicyText"
defaultMessage="Default policy cannot be deleted"
/>
</EuiText>
@ -343,7 +337,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
<EuiFormRow
label={
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.systemMonitoringFieldLabel"
id="xpack.fleet.agentPolicyForm.systemMonitoringFieldLabel"
defaultMessage="System monitoring"
/>
}
@ -353,12 +347,12 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
label={
<>
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.systemMonitoringText"
id="xpack.fleet.agentPolicyForm.systemMonitoringText"
defaultMessage="Collect system metrics"
/>{' '}
<EuiIconTip
content={i18n.translate(
'xpack.ingestManager.agentPolicyForm.systemMonitoringTooltipText',
'xpack.fleet.agentPolicyForm.systemMonitoringTooltipText',
{
defaultMessage:
'Enable this option to bootstrap your policy with an integration that collects system metrics and information.',
@ -385,7 +379,7 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
id="advancedOptions"
buttonContent={
<FormattedMessage
id="xpack.ingestManager.agentPolicyForm.advancedOptionsToggleLabel"
id="xpack.fleet.agentPolicyForm.advancedOptionsToggleLabel"
defaultMessage="Advanced options"
/>
}

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
View file

@ -41,7 +41,7 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
<EuiCallOut
title={
<FormattedMessage
id="xpack.ingestManager.policyDetails.ErrorGettingFullAgentPolicy"
id="xpack.fleet.policyDetails.ErrorGettingFullAgentPolicy"
defaultMessage="Error loading agent policy"
/>
}
@ -69,13 +69,13 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
<h2 id="IngestManagerAgentPolicyYamlFlyoutTitle">
{agentPolicyData?.item ? (
<FormattedMessage
id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithName"
id="xpack.fleet.policyDetails.yamlflyoutTitleWithName"
defaultMessage="'{name}' agent policy"
values={{ name: agentPolicyData.item.name }}
/>
) : (
<FormattedMessage
id="xpack.ingestManager.policyDetails.yamlflyoutTitleWithoutName"
id="xpack.fleet.policyDetails.yamlflyoutTitleWithoutName"
defaultMessage="Agent policy"
/>
)}
@ -88,7 +88,7 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.policyDetails.yamlFlyoutCloseButtonLabel"
id="xpack.fleet.policyDetails.yamlFlyoutCloseButtonLabel"
defaultMessage="Close"
/>
</EuiButtonEmpty>
@ -100,7 +100,7 @@ export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => voi
isDisabled={Boolean(isLoadingYaml && !yamlData)}
>
<FormattedMessage
id="xpack.ingestManager.policyDetails.yamlDownloadButtonLabel"
id="xpack.fleet.policyDetails.yamlDownloadButtonLabel"
defaultMessage="Download policy"
/>
</EuiButton>

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/confirm_deploy_modal.tsx
View file

@ -21,7 +21,7 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.ingestManager.agentPolicy.confirmModalTitle"
id="xpack.fleet.agentPolicy.confirmModalTitle"
defaultMessage="Save and deploy changes"
/>
}
@ -29,13 +29,13 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
onConfirm={onConfirm}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.agentPolicy.confirmModalCancelButtonLabel"
id="xpack.fleet.agentPolicy.confirmModalCancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
<FormattedMessage
id="xpack.ingestManager.agentPolicy.confirmModalConfirmButtonLabel"
id="xpack.fleet.agentPolicy.confirmModalConfirmButtonLabel"
defaultMessage="Save and deploy changes"
/>
}
@ -43,7 +43,7 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
>
<EuiCallOut
iconType="iInCircle"
title={i18n.translate('xpack.ingestManager.agentPolicy.confirmModalCalloutTitle', {
title={i18n.translate('xpack.fleet.agentPolicy.confirmModalCalloutTitle', {
defaultMessage:
'This action will update {agentCount, plural, one {# agent} other {# agents}}',
values: {
@ -53,7 +53,7 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
>
<div className="eui-textBreakWord">
<FormattedMessage
id="xpack.ingestManager.agentPolicy.confirmModalCalloutDescription"
id="xpack.fleet.agentPolicy.confirmModalCalloutDescription"
defaultMessage="Fleet has detected that the selected agent policy, {policyName}, is already in use by
some of your agents. As a result of this action, Fleet will deploy updates to all agents
that use this policy."
@ -65,7 +65,7 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
</EuiCallOut>
<EuiSpacer size="l" />
<FormattedMessage
id="xpack.ingestManager.agentPolicy.confirmModalDescription"
id="xpack.fleet.agentPolicy.confirmModalDescription"
defaultMessage="This action can not be undone. Are you sure you wish to continue?"
/>
</EuiConfirmModal>

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/linked_agent_count.tsx
View file

@ -15,7 +15,7 @@ export const LinkedAgentCount = memo<{ count: number; agentPolicyId: string }>(
const { getHref } = useLink();
const displayValue = (
<FormattedMessage
id="xpack.ingestManager.agentPolicy.linkedAgentCountText"
id="xpack.fleet.agentPolicy.linkedAgentCountText"
defaultMessage="{count, plural, one {# agent} other {# agents}}"
values={{ count }}
/>

62
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/package_policy_delete_provider.tsx
View file

@ -95,40 +95,28 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
if (successfulResults.length) {
const hasMultipleSuccesses = successfulResults.length > 1;
const successMessage = hasMultipleSuccesses
? i18n.translate(
'xpack.ingestManager.deletePackagePolicy.successMultipleNotificationTitle',
{
defaultMessage: 'Deleted {count} integrations',
values: { count: successfulResults.length },
}
)
: i18n.translate(
'xpack.ingestManager.deletePackagePolicy.successSingleNotificationTitle',
{
defaultMessage: "Deleted integration '{id}'",
values: { id: successfulResults[0].name || successfulResults[0].id },
}
);
? i18n.translate('xpack.fleet.deletePackagePolicy.successMultipleNotificationTitle', {
defaultMessage: 'Deleted {count} integrations',
values: { count: successfulResults.length },
})
: i18n.translate('xpack.fleet.deletePackagePolicy.successSingleNotificationTitle', {
defaultMessage: "Deleted integration '{id}'",
values: { id: successfulResults[0].name || successfulResults[0].id },
});
notifications.toasts.addSuccess(successMessage);
}
if (failedResults.length) {
const hasMultipleFailures = failedResults.length > 1;
const failureMessage = hasMultipleFailures
? i18n.translate(
'xpack.ingestManager.deletePackagePolicy.failureMultipleNotificationTitle',
{
defaultMessage: 'Error deleting {count} integrations',
values: { count: failedResults.length },
}
)
: i18n.translate(
'xpack.ingestManager.deletePackagePolicy.failureSingleNotificationTitle',
{
defaultMessage: "Error deleting integration '{id}'",
values: { id: failedResults[0].id },
}
);
? i18n.translate('xpack.fleet.deletePackagePolicy.failureMultipleNotificationTitle', {
defaultMessage: 'Error deleting {count} integrations',
values: { count: failedResults.length },
})
: i18n.translate('xpack.fleet.deletePackagePolicy.failureSingleNotificationTitle', {
defaultMessage: "Error deleting integration '{id}'",
values: { id: failedResults[0].id },
});
notifications.toasts.addDanger(failureMessage);
}
@ -137,7 +125,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
}
} catch (e) {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.deletePackagePolicy.fatalErrorNotificationTitle', {
i18n.translate('xpack.fleet.deletePackagePolicy.fatalErrorNotificationTitle', {
defaultMessage: 'Error deleting integration',
})
);
@ -157,7 +145,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.deleteMultipleTitle"
id="xpack.fleet.deletePackagePolicy.confirmModal.deleteMultipleTitle"
defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
values={{ count: packagePolicies.length }}
/>
@ -166,19 +154,19 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
onConfirm={deletePackagePolicies}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.cancelButtonLabel"
id="xpack.fleet.deletePackagePolicy.confirmModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
isLoading || isLoadingAgentsCount ? (
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingButtonLabel"
id="xpack.fleet.deletePackagePolicy.confirmModal.loadingButtonLabel"
defaultMessage="Loading…"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.confirmButtonLabel"
id="xpack.fleet.deletePackagePolicy.confirmModal.confirmButtonLabel"
defaultMessage="Delete {agentPoliciesCount, plural, one {integration} other {integrations}}"
values={{
agentPoliciesCount: packagePolicies.length,
@ -191,7 +179,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
>
{isLoadingAgentsCount ? (
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.loadingAgentsCountMessage"
id="xpack.fleet.deletePackagePolicy.confirmModal.loadingAgentsCountMessage"
defaultMessage="Checking affected agents…"
/>
) : agentsCount ? (
@ -200,14 +188,14 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
color="danger"
title={
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsTitle"
id="xpack.fleet.deletePackagePolicy.confirmModal.affectedAgentsTitle"
defaultMessage="This action will affect {agentsCount} {agentsCount, plural, one {agent} other {agents}}."
values={{ agentsCount }}
/>
}
>
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.affectedAgentsMessage"
id="xpack.fleet.deletePackagePolicy.confirmModal.affectedAgentsMessage"
defaultMessage="Fleet has detected that {agentPolicyName} is already in use by some of your agents."
values={{
agentPolicyName: <strong>{agentPolicy.name}</strong>,
@ -219,7 +207,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
) : null}
{!isLoadingAgentsCount && (
<FormattedMessage
id="xpack.ingestManager.deletePackagePolicy.confirmModal.generalMessage"
id="xpack.fleet.deletePackagePolicy.confirmModal.generalMessage"
defaultMessage="This action can not be undone. Are you sure you wish to continue?"
/>
)}

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/custom_package_policy.tsx
View file

@ -46,7 +46,7 @@ const EmptyPackagePolicy: CustomConfigurePackagePolicyContent = () => (
<EuiText>
<p>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.noPolicyOptionsMessage"
id="xpack.fleet.createPackagePolicy.stepConfigure.noPolicyOptionsMessage"
defaultMessage="Nothing to configure"
/>
</p>

18
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
View file

@ -54,7 +54,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
<h1>
{from === 'edit' ? (
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.pageTitleWithPackageName"
id="xpack.fleet.editPackagePolicy.pageTitleWithPackageName"
defaultMessage="Edit {packageName} integration"
values={{
packageName: packageInfo.title,
@ -62,7 +62,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
/>
) : (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.pageTitleWithPackageName"
id="xpack.fleet.createPackagePolicy.pageTitleWithPackageName"
defaultMessage="Add {packageName} integration"
values={{
packageName: packageInfo.title,
@ -80,7 +80,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
<EuiText>
<h1>
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.pageTitle"
id="xpack.fleet.editPackagePolicy.pageTitle"
defaultMessage="Edit integration"
/>
</h1>
@ -89,7 +89,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
<EuiText>
<h1>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.pageTitle"
id="xpack.fleet.createPackagePolicy.pageTitle"
defaultMessage="Add integration"
/>
</h1>
@ -100,17 +100,17 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
const pageDescription = useMemo(() => {
return from === 'edit' ? (
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.pageDescription"
id="xpack.fleet.editPackagePolicy.pageDescription"
defaultMessage="Modify integration settings and deploy changes to the selected agent policy."
/>
) : from === 'policy' ? (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPolicy"
id="xpack.fleet.createPackagePolicy.pageDescriptionfromPolicy"
defaultMessage="Configure an integration for the selected agent policy."
/>
) : (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage"
id="xpack.fleet.createPackagePolicy.pageDescriptionfromPackage"
defaultMessage="Follow these instructions to add this integration to an agent policy."
/>
);
@ -129,7 +129,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
data-test-subj={`${dataTestSubj}_cancelBackLink`}
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.cancelLinkText"
id="xpack.fleet.createPackagePolicy.cancelLinkText"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -149,7 +149,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
<EuiDescriptionList className="eui-textRight" textStyle="reverse">
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.agentPolicyNameLabel"
id="xpack.fleet.createPackagePolicy.agentPolicyNameLabel"
defaultMessage="Agent policy"
/>
</EuiDescriptionListTitle>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_config.tsx
View file

@ -76,7 +76,7 @@ export const PackagePolicyInputConfig: React.FunctionComponent<{
<EuiText>
<h4>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsTitle"
id="xpack.fleet.createPackagePolicy.stepConfigure.inputSettingsTitle"
defaultMessage="Settings"
/>
</h4>
@ -85,7 +85,7 @@ export const PackagePolicyInputConfig: React.FunctionComponent<{
<EuiText color="subdued" size="s">
<p>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputSettingsDescription"
id="xpack.fleet.createPackagePolicy.stepConfigure.inputSettingsDescription"
defaultMessage="The following settings are applicable to all inputs below."
/>
</p>
@ -133,7 +133,7 @@ export const PackagePolicyInputConfig: React.FunctionComponent<{
flush="left"
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
id="xpack.fleet.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
defaultMessage="Advanced options"
/>
</EuiButtonEmpty>
@ -142,7 +142,7 @@ export const PackagePolicyInputConfig: React.FunctionComponent<{
<EuiFlexItem grow={false}>
<EuiText color="danger" size="s">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
id="xpack.fleet.createPackagePolicy.stepConfigure.errorCountText"
defaultMessage="{count, plural, one {# error} other {# errors}}"
values={{ count: advancedVarsWithErrorsCount }}
/>

6
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_panel.tsx
View file

@ -133,7 +133,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
<EuiFlexItem grow={false}>
<EuiText color="danger" size="s">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
id="xpack.fleet.createPackagePolicy.stepConfigure.errorCountText"
defaultMessage="{count, plural, one {# error} other {# errors}}"
values={{ count: errorCount }}
/>
@ -148,7 +148,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
aria-label={
isShowingStreams
? i18n.translate(
'xpack.ingestManager.createPackagePolicy.stepConfigure.hideStreamsAriaLabel',
'xpack.fleet.createPackagePolicy.stepConfigure.hideStreamsAriaLabel',
{
defaultMessage: 'Hide {type} inputs',
values: {
@ -157,7 +157,7 @@ export const PackagePolicyInputPanel: React.FunctionComponent<{
}
)
: i18n.translate(
'xpack.ingestManager.createPackagePolicy.stepConfigure.showStreamsAriaLabel',
'xpack.fleet.createPackagePolicy.stepConfigure.showStreamsAriaLabel',
{
defaultMessage: 'Show {type} inputs',
values: {

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
View file

@ -135,7 +135,7 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
flush="left"
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
id="xpack.fleet.createPackagePolicy.stepConfigure.toggleAdvancedOptionsButtonText"
defaultMessage="Advanced options"
/>
</EuiButtonEmpty>
@ -144,7 +144,7 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
<EuiFlexItem grow={false}>
<EuiText color="danger" size="s">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
id="xpack.fleet.createPackagePolicy.stepConfigure.errorCountText"
defaultMessage="{count, plural, one {# error} other {# errors}}"
values={{ count: advancedVarsWithErrorsCount }}
/>

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
View file

@ -78,7 +78,7 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
!required ? (
<EuiText size="xs" color="subdued">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
id="xpack.fleet.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
defaultMessage="Optional"
/>
</EuiText>

30
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
View file

@ -241,7 +241,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
}
notifications.toasts.addSuccess({
title: i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationTitle', {
title: i18n.translate('xpack.fleet.createPackagePolicy.addedNotificationTitle', {
defaultMessage: `'{packagePolicyName}' integration added.`,
values: {
packagePolicyName: packagePolicy.name,
@ -249,7 +249,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
}),
text:
agentCount && agentPolicy
? i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationMessage', {
? i18n.translate('xpack.fleet.createPackagePolicy.addedNotificationMessage', {
defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy.`,
values: {
agentPolicyName: agentPolicy.name,
@ -338,27 +338,21 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
const steps: EuiStepProps[] = [
from === 'package'
? {
title: i18n.translate(
'xpack.ingestManager.createPackagePolicy.stepSelectAgentPolicyTitle',
{
defaultMessage: 'Select an agent policy',
}
),
title: i18n.translate('xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle', {
defaultMessage: 'Select an agent policy',
}),
children: stepSelectAgentPolicy,
}
: {
title: i18n.translate('xpack.ingestManager.createPackagePolicy.stepSelectPackageTitle', {
title: i18n.translate('xpack.fleet.createPackagePolicy.stepSelectPackageTitle', {
defaultMessage: 'Select an integration',
}),
children: stepSelectPackage,
},
{
title: i18n.translate(
'xpack.ingestManager.createPackagePolicy.stepConfigurePackagePolicyTitle',
{
defaultMessage: 'Configure integration',
}
),
title: i18n.translate('xpack.fleet.createPackagePolicy.stepConfigurePackagePolicyTitle', {
defaultMessage: 'Configure integration',
}),
status: !packageInfo || !agentPolicy || isLoadingSecondStep ? 'disabled' : undefined,
'data-test-subj': 'dataCollectionSetupStep',
children: stepConfigurePackagePolicy,
@ -392,7 +386,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
{!isLoadingSecondStep && agentPolicy && packageInfo && formState === 'INVALID' ? (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
@ -408,7 +402,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
data-test-subj="createPackagePolicyCancelButton"
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.cancelButton"
id="xpack.fleet.createPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -424,7 +418,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
data-test-subj="createPackagePolicySaveButton"
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.saveButton"
id="xpack.fleet.createPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>

17
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/services/validate_package_policy.ts
View file

@ -54,7 +54,7 @@ export const validatePackagePolicy = (
if (!packagePolicy.name.trim()) {
validationResults.name = [
i18n.translate('xpack.ingestManager.packagePolicyValidation.nameRequiredErrorMessage', {
i18n.translate('xpack.fleet.packagePolicyValidation.nameRequiredErrorMessage', {
defaultMessage: 'Name is required',
}),
];
@ -183,7 +183,7 @@ export const validatePackagePolicyConfig = (
if (varDef.required) {
if (parsedValue === undefined || (typeof parsedValue === 'string' && !parsedValue)) {
errors.push(
i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
values: {
fieldName: varDef.title || varDef.name,
@ -198,12 +198,9 @@ export const validatePackagePolicyConfig = (
parsedValue = safeLoad(value);
} catch (e) {
errors.push(
i18n.translate(
'xpack.ingestManager.packagePolicyValidation.invalidYamlFormatErrorMessage',
{
defaultMessage: 'Invalid YAML format',
}
)
i18n.translate('xpack.fleet.packagePolicyValidation.invalidYamlFormatErrorMessage', {
defaultMessage: 'Invalid YAML format',
})
);
}
}
@ -211,7 +208,7 @@ export const validatePackagePolicyConfig = (
if (varDef.multi) {
if (parsedValue && !Array.isArray(parsedValue)) {
errors.push(
i18n.translate('xpack.ingestManager.packagePolicyValidation.invalidArrayErrorMessage', {
i18n.translate('xpack.fleet.packagePolicyValidation.invalidArrayErrorMessage', {
defaultMessage: 'Invalid format',
})
);
@ -221,7 +218,7 @@ export const validatePackagePolicyConfig = (
(!parsedValue || (Array.isArray(parsedValue) && parsedValue.length === 0))
) {
errors.push(
i18n.translate('xpack.ingestManager.packagePolicyValidation.requiredErrorMessage', {
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
values: {
fieldName: varDef.title || varDef.name,

16
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
View file

@ -87,14 +87,14 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
title={
<h4>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle"
id="xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionTitle"
defaultMessage="Integration settings"
/>
</h4>
}
description={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription"
id="xpack.fleet.createPackagePolicy.stepConfigure.integrationSettingsSectionDescription"
defaultMessage="Choose a name and description to help identify how this integration will be used."
/>
}
@ -106,7 +106,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
error={validationResults.name}
label={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel"
id="xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNameInputLabel"
defaultMessage="Integration name"
/>
}
@ -126,14 +126,14 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
<EuiFormRow
label={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel"
id="xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDescriptionInputLabel"
defaultMessage="Description"
/>
}
labelAppend={
<EuiText size="xs" color="subdued">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
id="xpack.fleet.createPackagePolicy.stepConfigure.inputVarFieldOptionalLabel"
defaultMessage="Optional"
/>
</EuiText>
@ -162,7 +162,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
flush="left"
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText"
id="xpack.fleet.createPackagePolicy.stepConfigure.advancedOptionsToggleLinkText"
defaultMessage="Advanced options"
/>
</EuiButtonEmpty>
@ -171,7 +171,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
<EuiFlexItem grow={false}>
<EuiText color="danger" size="s">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.errorCountText"
id="xpack.fleet.createPackagePolicy.stepConfigure.errorCountText"
defaultMessage="{count, plural, one {# error} other {# errors}}"
values={{ count: 1 }}
/>
@ -190,7 +190,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
error={validationResults.namespace}
label={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel"
id="xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyNamespaceInputLabel"
defaultMessage="Namespace"
/>
}

16
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx
View file

@ -171,7 +171,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingPackageTitle"
defaultMessage="Error loading package information"
/>
}
@ -186,7 +186,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingAgentPoliciesTitle"
defaultMessage="Error loading agent policies"
/>
}
@ -219,7 +219,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyLabel"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyLabel"
defaultMessage="Agent policy"
/>
</EuiFlexItem>
@ -230,7 +230,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
>
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.addButton"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.addButton"
defaultMessage="Create agent policy"
/>
</EuiLink>
@ -241,7 +241,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
helpText={
isFleetReady && selectedPolicyId ? (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsDescriptionText"
defaultMessage="{count, plural, one {# agent} other {# agents}} are enrolled with the selected agent policy."
values={{
count: agentPoliciesById[selectedPolicyId].agents || 0,
@ -252,7 +252,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
>
<EuiComboBox
placeholder={i18n.translate(
'xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyPlaceholderText',
'xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyPlaceholderText',
{
defaultMessage: 'Select an agent policy to add this integration to',
}
@ -277,7 +277,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
<EuiFlexItem grow={2} className="eui-textRight">
<EuiTextColor color="subdued">
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyAgentsCountText"
defaultMessage="{count, plural, one {# agent} other {# agents}} enrolled"
values={{
count: agentPoliciesById[option.value!].agents || 0,
@ -309,7 +309,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle"
id="xpack.fleet.createPackagePolicy.StepSelectPolicy.errorLoadingSelectedAgentPolicyTitle"
defaultMessage="Error loading selected agent policy"
/>
}

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/step_select_package.tsx
View file

@ -103,7 +103,7 @@ export const StepSelectPackage: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle"
id="xpack.fleet.createPackagePolicy.stepSelectPackage.errorLoadingPolicyTitle"
defaultMessage="Error loading agent policy information"
/>
}
@ -118,7 +118,7 @@ export const StepSelectPackage: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle"
id="xpack.fleet.createPackagePolicy.stepSelectPackage.errorLoadingPackagesTitle"
defaultMessage="Error loading integrations"
/>
}
@ -157,7 +157,7 @@ export const StepSelectPackage: React.FunctionComponent<{
}}
searchProps={{
placeholder: i18n.translate(
'xpack.ingestManager.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder',
'xpack.fleet.createPackagePolicy.stepSelectPackage.filterPackagesInputPlaceholder',
{
defaultMessage: 'Search for integrations',
}
@ -190,7 +190,7 @@ export const StepSelectPackage: React.FunctionComponent<{
<Error
title={
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle"
id="xpack.fleet.createPackagePolicy.stepSelectPackage.errorLoadingSelectedPackageTitle"
defaultMessage="Error loading selected integration"
/>
}

6
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/no_package_policies.tsx
View file

@ -18,14 +18,14 @@ export const NoPackagePolicies = memo<{ policyId: string }>(({ policyId }) => {
title={
<h3>
<FormattedMessage
id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstTitle"
id="xpack.fleet.policyDetailsPackagePolicies.createFirstTitle"
defaultMessage="Add your first integration"
/>
</h3>
}
body={
<FormattedMessage
id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstMessage"
id="xpack.fleet.policyDetailsPackagePolicies.createFirstMessage"
defaultMessage="This policy does not have any integrations yet."
/>
}
@ -36,7 +36,7 @@ export const NoPackagePolicies = memo<{ policyId: string }>(({ policyId }) => {
href={getHref('add_integration_from_policy', { policyId })}
>
<FormattedMessage
id="xpack.ingestManager.policyDetailsPackagePolicies.createFirstButtonText"
id="xpack.fleet.policyDetailsPackagePolicies.createFirstButtonText"
defaultMessage="Add integration"
/>
</EuiButton>

34
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
View file

@ -84,12 +84,9 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
{
field: 'name',
sortable: true,
name: i18n.translate(
'xpack.ingestManager.policyDetails.packagePoliciesTable.nameColumnTitle',
{
defaultMessage: 'Name',
}
),
name: i18n.translate('xpack.fleet.policyDetails.packagePoliciesTable.nameColumnTitle', {
defaultMessage: 'Name',
}),
render: (value: string) => (
<span className="eui-textTruncate" title={value}>
{value}
@ -99,7 +96,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
{
field: 'description',
name: i18n.translate(
'xpack.ingestManager.policyDetails.packagePoliciesTable.descriptionColumnTitle',
'xpack.fleet.policyDetails.packagePoliciesTable.descriptionColumnTitle',
{
defaultMessage: 'Description',
}
@ -114,7 +111,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
field: 'packageTitle',
sortable: true,
name: i18n.translate(
'xpack.ingestManager.policyDetails.packagePoliciesTable.packageNameColumnTitle',
'xpack.fleet.policyDetails.packagePoliciesTable.packageNameColumnTitle',
{
defaultMessage: 'Integration',
}
@ -140,7 +137,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
{
field: 'namespace',
name: i18n.translate(
'xpack.ingestManager.policyDetails.packagePoliciesTable.namespaceColumnTitle',
'xpack.fleet.policyDetails.packagePoliciesTable.namespaceColumnTitle',
{
defaultMessage: 'Namespace',
}
@ -150,12 +147,9 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
},
},
{
name: i18n.translate(
'xpack.ingestManager.policyDetails.packagePoliciesTable.actionsColumnTitle',
{
defaultMessage: 'Actions',
}
),
name: i18n.translate('xpack.fleet.policyDetails.packagePoliciesTable.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
{
render: (packagePolicy: InMemoryPackagePolicy) => (
@ -169,7 +163,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
// key="packagePolicyView"
// >
// <FormattedMessage
// id="xpack.ingestManager.policyDetails.packagePoliciesTable.viewActionTitle"
// id="xpack.fleet.policyDetails.packagePoliciesTable.viewActionTitle"
// defaultMessage="View integration"
// />
// </EuiContextMenuItem>,
@ -183,14 +177,14 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
key="packagePolicyEdit"
>
<FormattedMessage
id="xpack.ingestManager.policyDetails.packagePoliciesTable.editActionTitle"
id="xpack.fleet.policyDetails.packagePoliciesTable.editActionTitle"
defaultMessage="Edit integration"
/>
</EuiContextMenuItem>,
// FIXME: implement Copy package policy action
// <EuiContextMenuItem disabled icon="copy" onClick={() => {}} key="packagePolicyCopy">
// <FormattedMessage
// id="xpack.ingestManager.policyDetails.packagePoliciesTable.copyActionTitle"
// id="xpack.fleet.policyDetails.packagePoliciesTable.copyActionTitle"
// defaultMessage="Copy integration"
// />
// </EuiContextMenuItem>,
@ -205,7 +199,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
}}
>
<FormattedMessage
id="xpack.ingestManager.policyDetails.packagePoliciesTable.deleteActionTitle"
id="xpack.fleet.policyDetails.packagePoliciesTable.deleteActionTitle"
defaultMessage="Delete integration"
/>
</DangerEuiContextMenuItem>
@ -243,7 +237,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
href={getHref('add_integration_from_policy', { policyId: agentPolicy.id })}
>
<FormattedMessage
id="xpack.ingestManager.policyDetails.addPackagePolicyButtonText"
id="xpack.fleet.policyDetails.addPackagePolicyButtonText"
defaultMessage="Add integration"
/>
</EuiButton>,

14
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
View file

@ -71,7 +71,7 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
});
if (data) {
notifications.toasts.addSuccess(
i18n.translate('xpack.ingestManager.editAgentPolicy.successNotificationTitle', {
i18n.translate('xpack.fleet.editAgentPolicy.successNotificationTitle', {
defaultMessage: "Successfully updated '{name}' settings",
values: { name: agentPolicy.name },
})
@ -82,14 +82,14 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
notifications.toasts.addDanger(
error
? error.message
: i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
: i18n.translate('xpack.fleet.editAgentPolicy.errorNotificationTitle', {
defaultMessage: 'Unable to update agent policy',
})
);
}
} catch (e) {
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.editAgentPolicy.errorNotificationTitle', {
i18n.translate('xpack.fleet.editAgentPolicy.errorNotificationTitle', {
defaultMessage: 'Unable to update agent policy',
})
);
@ -145,7 +145,7 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem>
<FormattedMessage
id="xpack.ingestManager.editAgentPolicy.unsavedChangesText"
id="xpack.fleet.editAgentPolicy.unsavedChangesText"
defaultMessage="You have unsaved changes"
/>
</EuiFlexItem>
@ -160,7 +160,7 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
}}
>
<FormattedMessage
id="xpack.ingestManager.editAgentPolicy.cancelButtonText"
id="xpack.fleet.editAgentPolicy.cancelButtonText"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -178,12 +178,12 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
>
{isLoading ? (
<FormattedMessage
id="xpack.ingestManager.editAgentPolicy.savingButtonText"
id="xpack.fleet.editAgentPolicy.savingButtonText"
defaultMessage="Saving…"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.editAgentPolicy.saveButtonText"
id="xpack.fleet.editAgentPolicy.saveButtonText"
defaultMessage="Save changes"
/>
)}

22
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/index.tsx
View file

@ -74,7 +74,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
size="xs"
>
<FormattedMessage
id="xpack.ingestManager.policyDetails.viewAgentListTitle"
id="xpack.fleet.policyDetails.viewAgentListTitle"
defaultMessage="View all agent policies"
/>
</EuiButtonEmpty>
@ -87,7 +87,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
) : (
(agentPolicy && agentPolicy.name) || (
<FormattedMessage
id="xpack.ingestManager.policyDetails.policyDetailsTitle"
id="xpack.fleet.policyDetails.policyDetailsTitle"
defaultMessage="Policy '{id}'"
values={{
id: policyId,
@ -118,14 +118,14 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
<EuiFlexGroup justifyContent={'flexEnd'} direction="row">
{[
{
label: i18n.translate('xpack.ingestManager.policyDetails.summary.revision', {
label: i18n.translate('xpack.fleet.policyDetails.summary.revision', {
defaultMessage: 'Revision',
}),
content: agentPolicy?.revision ?? 0,
},
{ isDivider: true },
{
label: i18n.translate('xpack.ingestManager.policyDetails.summary.integrations', {
label: i18n.translate('xpack.fleet.policyDetails.summary.integrations', {
defaultMessage: 'Integrations',
}),
content: (
@ -141,7 +141,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
},
{ isDivider: true },
{
label: i18n.translate('xpack.ingestManager.policyDetails.summary.usedBy', {
label: i18n.translate('xpack.fleet.policyDetails.summary.usedBy', {
defaultMessage: 'Used by',
}),
content: (
@ -153,7 +153,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
},
{ isDivider: true },
{
label: i18n.translate('xpack.ingestManager.policyDetails.summary.lastUpdated', {
label: i18n.translate('xpack.fleet.policyDetails.summary.lastUpdated', {
defaultMessage: 'Last updated on',
}),
content:
@ -217,7 +217,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
return [
{
id: 'integrations',
name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.packagePoliciesTabText', {
name: i18n.translate('xpack.fleet.policyDetails.subTabs.packagePoliciesTabText', {
defaultMessage: 'Integrations',
}),
href: getHref('policy_details', { policyId, tabId: 'integrations' }),
@ -225,7 +225,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
},
{
id: 'settings',
name: i18n.translate('xpack.ingestManager.policyDetails.subTabs.settingsTabText', {
name: i18n.translate('xpack.fleet.policyDetails.subTabs.settingsTabText', {
defaultMessage: 'Settings',
}),
href: getHref('policy_details', { policyId, tabId: 'settings' }),
@ -248,7 +248,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
id="xpack.fleet.policyDetails.unexceptedErrorTitle"
defaultMessage="An error happened while loading the agent policy"
/>
}
@ -262,11 +262,11 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.policyDetails.unexceptedErrorTitle"
id="xpack.fleet.policyDetails.unexceptedErrorTitle"
defaultMessage="An error happened while loading the agent policy"
/>
}
error={i18n.translate('xpack.ingestManager.policyDetails.policyNotFoundErrorTitle', {
error={i18n.translate('xpack.fleet.policyDetails.policyNotFoundErrorTitle', {
defaultMessage: "Policy '{id}' not found",
values: {
id: policyId,

20
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
View file

@ -214,7 +214,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
if (!error) {
history.push(getPath('policy_details', { policyId }));
notifications.toasts.addSuccess({
title: i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationTitle', {
title: i18n.translate('xpack.fleet.editPackagePolicy.updatedNotificationTitle', {
defaultMessage: `Successfully updated '{packagePolicyName}'`,
values: {
packagePolicyName: packagePolicy.name,
@ -222,7 +222,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
}),
text:
agentCount && agentPolicy
? i18n.translate('xpack.ingestManager.editPackagePolicy.updatedNotificationMessage', {
? i18n.translate('xpack.fleet.editPackagePolicy.updatedNotificationMessage', {
defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
values: {
agentPolicyName: agentPolicy.name,
@ -233,14 +233,14 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
} else {
if (error.statusCode === 409) {
notifications.toasts.addError(error, {
title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
title: i18n.translate('xpack.fleet.editPackagePolicy.failedNotificationTitle', {
defaultMessage: `Error updating '{packagePolicyName}'`,
values: {
packagePolicyName: packagePolicy.name,
},
}),
toastMessage: i18n.translate(
'xpack.ingestManager.editPackagePolicy.failedConflictNotificationMessage',
'xpack.fleet.editPackagePolicy.failedConflictNotificationMessage',
{
defaultMessage: `Data is out of date. Refresh the page to get the latest policy.`,
}
@ -248,7 +248,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
});
} else {
notifications.toasts.addError(error, {
title: i18n.translate('xpack.ingestManager.editPackagePolicy.failedNotificationTitle', {
title: i18n.translate('xpack.fleet.editPackagePolicy.failedNotificationTitle', {
defaultMessage: `Error updating '{packagePolicyName}'`,
values: {
packagePolicyName: packagePolicy.name,
@ -309,13 +309,13 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.errorLoadingDataTitle"
id="xpack.fleet.editPackagePolicy.errorLoadingDataTitle"
defaultMessage="Error loading data"
/>
}
error={
loadingError ||
i18n.translate('xpack.ingestManager.editPackagePolicy.errorLoadingDataMessage', {
i18n.translate('xpack.fleet.editPackagePolicy.errorLoadingDataMessage', {
defaultMessage: 'There was an error loading this intergration information',
})
}
@ -338,7 +338,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
{agentPolicy && packageInfo && formState === 'INVALID' ? (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.errorOnSaveText"
id="xpack.fleet.createPackagePolicy.errorOnSaveText"
defaultMessage="Your integration policy has errors. Please fix them before saving."
/>
) : null}
@ -348,7 +348,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
<EuiButtonEmpty color="ghost" href={cancelUrl}>
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.cancelButton"
id="xpack.fleet.editPackagePolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -363,7 +363,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
fill
>
<FormattedMessage
id="xpack.ingestManager.editPackagePolicy.saveButton"
id="xpack.fleet.editPackagePolicy.saveButton"
defaultMessage="Save integration"
/>
</EuiButton>

30
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
View file

@ -66,7 +66,7 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiTitle size="m">
<h2 id="CreateAgentPolicyFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.createAgentPolicy.flyoutTitle"
id="xpack.fleet.createAgentPolicy.flyoutTitle"
defaultMessage="Create agent policy"
/>
</h2>
@ -75,7 +75,7 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiText size="s">
<p>
<FormattedMessage
id="xpack.ingestManager.createAgentPolicy.flyoutTitleDescription"
id="xpack.fleet.createAgentPolicy.flyoutTitleDescription"
defaultMessage="Agent policies are used to manage settings across a group of agents. You can add integrations to your agent policy to specify what data your agents collect. When you edit an agent policy, you can use Fleet to deploy updates to a specified group of agents."
/>
</p>
@ -101,7 +101,7 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={() => onClose()} flush="left">
<FormattedMessage
id="xpack.ingestManager.createAgentPolicy.cancelButtonLabel"
id="xpack.fleet.createAgentPolicy.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -118,31 +118,25 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
setIsLoading(false);
if (data) {
notifications.toasts.addSuccess(
i18n.translate(
'xpack.ingestManager.createAgentPolicy.successNotificationTitle',
{
defaultMessage: "Agent policy '{name}' created",
values: { name: agentPolicy.name },
}
)
i18n.translate('xpack.fleet.createAgentPolicy.successNotificationTitle', {
defaultMessage: "Agent policy '{name}' created",
values: { name: agentPolicy.name },
})
);
onClose(data.item);
} else {
notifications.toasts.addDanger(
error
? error.message
: i18n.translate(
'xpack.ingestManager.createAgentPolicy.errorNotificationTitle',
{
defaultMessage: 'Unable to create agent policy',
}
)
: i18n.translate('xpack.fleet.createAgentPolicy.errorNotificationTitle', {
defaultMessage: 'Unable to create agent policy',
})
);
}
} catch (e) {
setIsLoading(false);
notifications.toasts.addDanger(
i18n.translate('xpack.ingestManager.createAgentPolicy.errorNotificationTitle', {
i18n.translate('xpack.fleet.createAgentPolicy.errorNotificationTitle', {
defaultMessage: 'Unable to create agent policy',
})
);
@ -150,7 +144,7 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
}}
>
<FormattedMessage
id="xpack.ingestManager.createAgentPolicy.submitButtonLabel"
id="xpack.fleet.createAgentPolicy.submitButtonLabel"
defaultMessage="Create agent policy"
/>
</EuiButton>

37
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/index.tsx
View file

@ -46,7 +46,7 @@ const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => (
<EuiText>
<h1>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.pageTitle"
id="xpack.fleet.agentPolicyList.pageTitle"
defaultMessage="Agent policies"
/>
</h1>
@ -56,7 +56,7 @@ const AgentPolicyListPageLayout: React.FunctionComponent = ({ children }) => (
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.pageSubtitle"
id="xpack.fleet.agentPolicyList.pageSubtitle"
defaultMessage="Use agent policies to manage your agents and the data they collect."
/>
</p>
@ -124,7 +124,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
{
field: 'name',
sortable: true,
name: i18n.translate('xpack.ingestManager.agentPolicyList.nameColumnTitle', {
name: i18n.translate('xpack.fleet.agentPolicyList.nameColumnTitle', {
defaultMessage: 'Name',
}),
width: '20%',
@ -142,7 +142,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
<EuiFlexItem grow={true}>
<EuiText color="subdued" size="xs" style={{ whiteSpace: 'nowrap' }}>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.revisionNumber"
id="xpack.fleet.agentPolicyList.revisionNumber"
defaultMessage="rev. {revNumber}"
values={{ revNumber: agentPolicy.revision }}
/>
@ -153,7 +153,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'description',
name: i18n.translate('xpack.ingestManager.agentPolicyList.descriptionColumnTitle', {
name: i18n.translate('xpack.fleet.agentPolicyList.descriptionColumnTitle', {
defaultMessage: 'Description',
}),
width: '35%',
@ -166,7 +166,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
{
field: 'updated_at',
sortable: true,
name: i18n.translate('xpack.ingestManager.agentPolicyList.updatedOnColumnTitle', {
name: i18n.translate('xpack.fleet.agentPolicyList.updatedOnColumnTitle', {
defaultMessage: 'Last updated on',
}),
render: (date: AgentPolicy['updated_at']) => (
@ -175,7 +175,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'agents',
name: i18n.translate('xpack.ingestManager.agentPolicyList.agentsColumnTitle', {
name: i18n.translate('xpack.fleet.agentPolicyList.agentsColumnTitle', {
defaultMessage: 'Agents',
}),
dataType: 'number',
@ -185,18 +185,15 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'package_policies',
name: i18n.translate(
'xpack.ingestManager.agentPolicyList.packagePoliciesCountColumnTitle',
{
defaultMessage: 'Integrations',
}
),
name: i18n.translate('xpack.fleet.agentPolicyList.packagePoliciesCountColumnTitle', {
defaultMessage: 'Integrations',
}),
dataType: 'number',
render: (packagePolicies: AgentPolicy['package_policies']) =>
packagePolicies ? packagePolicies.length : 0,
},
{
name: i18n.translate('xpack.ingestManager.agentPolicyList.actionsColumnTitle', {
name: i18n.translate('xpack.fleet.agentPolicyList.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
@ -229,7 +226,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
onClick={() => setIsCreateAgentPolicyFlyoutOpen(true)}
>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.addButton"
id="xpack.fleet.agentPolicyList.addButton"
defaultMessage="Create agent policy"
/>
</EuiButton>
@ -243,7 +240,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
title={
<h2>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.noAgentPoliciesPrompt"
id="xpack.fleet.agentPolicyList.noAgentPoliciesPrompt"
defaultMessage="No agent policies"
/>
</h2>
@ -291,7 +288,7 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
<EuiFlexItem grow={false}>
<EuiButton color="primary" iconType="refresh" onClick={() => resendRequest()}>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.reloadAgentPoliciesButtonText"
id="xpack.fleet.agentPolicyList.reloadAgentPoliciesButtonText"
defaultMessage="Reload"
/>
</EuiButton>
@ -306,20 +303,20 @@ export const AgentPolicyListPage: React.FunctionComponent<{}> = () => {
noItemsMessage={
isLoading ? (
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.loadingAgentPoliciesMessage"
id="xpack.fleet.agentPolicyList.loadingAgentPoliciesMessage"
defaultMessage="Loading agent policies…"
/>
) : !search.trim() && (agentPolicyData?.total ?? 0) === 0 ? (
emptyPrompt
) : (
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.noFilteredAgentPoliciesPrompt"
id="xpack.fleet.agentPolicyList.noFilteredAgentPoliciesPrompt"
defaultMessage="No agent policies found. {clearFiltersLink}"
values={{
clearFiltersLink: (
<EuiLink onClick={() => setSearch('')}>
<FormattedMessage
id="xpack.ingestManager.agentPolicyList.clearFiltersLinkText"
id="xpack.fleet.agentPolicyList.clearFiltersLinkText"
defaultMessage="Clear filters"
/>
</EuiLink>

6
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/components/data_stream_row_actions.tsx
View file

@ -16,18 +16,18 @@ export const DataStreamRowActions = memo<{ datastream: DataStream }>(({ datastre
const panels = [];
const actionNameSingular = (
<FormattedMessage
id="xpack.ingestManager.dataStreamList.viewDashboardActionText"
id="xpack.fleet.dataStreamList.viewDashboardActionText"
defaultMessage="View dashboard"
/>
);
const actionNamePlural = (
<FormattedMessage
id="xpack.ingestManager.dataStreamList.viewDashboardsActionText"
id="xpack.fleet.dataStreamList.viewDashboardsActionText"
defaultMessage="View dashboards"
/>
);
const panelTitle = i18n.translate('xpack.ingestManager.dataStreamList.viewDashboardsPanelTitle', {
const panelTitle = i18n.translate('xpack.fleet.dataStreamList.viewDashboardsPanelTitle', {
defaultMessage: 'View dashboards',
});

43
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/data_stream/list_page/index.tsx
View file

@ -31,7 +31,7 @@ const DataStreamListPageLayout: React.FunctionComponent = ({ children }) => (
<EuiText>
<h1>
<FormattedMessage
id="xpack.ingestManager.dataStreamList.pageTitle"
id="xpack.fleet.dataStreamList.pageTitle"
defaultMessage="Data streams"
/>
</h1>
@ -41,7 +41,7 @@ const DataStreamListPageLayout: React.FunctionComponent = ({ children }) => (
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.dataStreamList.pageSubtitle"
id="xpack.fleet.dataStreamList.pageSubtitle"
defaultMessage="Manage the data created by your agents."
/>
</p>
@ -75,21 +75,21 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
field: 'dataset',
sortable: true,
width: '25%',
name: i18n.translate('xpack.ingestManager.dataStreamList.datasetColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.datasetColumnTitle', {
defaultMessage: 'Dataset',
}),
},
{
field: 'type',
sortable: true,
name: i18n.translate('xpack.ingestManager.dataStreamList.typeColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.typeColumnTitle', {
defaultMessage: 'Type',
}),
},
{
field: 'namespace',
sortable: true,
name: i18n.translate('xpack.ingestManager.dataStreamList.namespaceColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.namespaceColumnTitle', {
defaultMessage: 'Namespace',
}),
render: (namespace: string) => {
@ -99,7 +99,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
{
field: 'package',
sortable: true,
name: i18n.translate('xpack.ingestManager.dataStreamList.integrationColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.integrationColumnTitle', {
defaultMessage: 'Integration',
}),
render(pkg: DataStream['package'], datastream: DataStream) {
@ -125,7 +125,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
sortable: true,
width: '25%',
dataType: 'date',
name: i18n.translate('xpack.ingestManager.dataStreamList.lastActivityColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.lastActivityColumnTitle', {
defaultMessage: 'Last activity',
}),
render: (date: DataStream['last_activity']) => {
@ -140,7 +140,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
{
field: 'size_in_bytes',
sortable: true,
name: i18n.translate('xpack.ingestManager.dataStreamList.sizeColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.sizeColumnTitle', {
defaultMessage: 'Size',
}),
render: (size: DataStream['size_in_bytes']) => {
@ -153,7 +153,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
},
},
{
name: i18n.translate('xpack.ingestManager.dataStreamList.actionsColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
@ -172,7 +172,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
title={
<h2>
<FormattedMessage
id="xpack.ingestManager.dataStreamList.noDataStreamsPrompt"
id="xpack.fleet.dataStreamList.noDataStreamsPrompt"
defaultMessage="No data streams"
/>
</h2>
@ -236,14 +236,14 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
message={
isLoading ? (
<FormattedMessage
id="xpack.ingestManager.dataStreamList.loadingDataStreamsMessage"
id="xpack.fleet.dataStreamList.loadingDataStreamsMessage"
defaultMessage="Loading data streams…"
/>
) : dataStreamsData && !dataStreamsData.data_streams.length ? (
emptyPrompt
) : (
<FormattedMessage
id="xpack.ingestManager.dataStreamList.noFilteredDataStreamsMessage"
id="xpack.fleet.dataStreamList.noFilteredDataStreamsMessage"
defaultMessage="No matching data streams found"
/>
)
@ -265,25 +265,22 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
onClick={() => resendRequest()}
>
<FormattedMessage
id="xpack.ingestManager.dataStreamList.reloadDataStreamsButtonText"
id="xpack.fleet.dataStreamList.reloadDataStreamsButtonText"
defaultMessage="Reload"
/>
</EuiButton>,
],
box: {
placeholder: i18n.translate(
'xpack.ingestManager.dataStreamList.searchPlaceholderTitle',
{
defaultMessage: 'Filter data streams',
}
),
placeholder: i18n.translate('xpack.fleet.dataStreamList.searchPlaceholderTitle', {
defaultMessage: 'Filter data streams',
}),
incremental: true,
},
filters: [
{
type: 'field_value_selection',
field: 'dataset',
name: i18n.translate('xpack.ingestManager.dataStreamList.datasetColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.datasetColumnTitle', {
defaultMessage: 'Dataset',
}),
multiSelect: 'or',
@ -293,7 +290,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
{
type: 'field_value_selection',
field: 'type',
name: i18n.translate('xpack.ingestManager.dataStreamList.typeColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.typeColumnTitle', {
defaultMessage: 'Type',
}),
multiSelect: 'or',
@ -303,7 +300,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
{
type: 'field_value_selection',
field: 'namespace',
name: i18n.translate('xpack.ingestManager.dataStreamList.namespaceColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.namespaceColumnTitle', {
defaultMessage: 'Namespace',
}),
multiSelect: 'or',
@ -313,7 +310,7 @@ export const DataStreamListPage: React.FunctionComponent<{}> = () => {
{
type: 'field_value_selection',
field: 'package',
name: i18n.translate('xpack.ingestManager.dataStreamList.integrationColumnTitle', {
name: i18n.translate('xpack.fleet.dataStreamList.integrationColumnTitle', {
defaultMessage: 'Integration',
}),
multiSelect: 'or',

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/assets_facet_group.tsx
View file

@ -79,7 +79,7 @@ export function AssetsFacetGroup({ assets }: { assets: AssetsGroupedByServiceByT
<EuiText>
<h4>
<FormattedMessage
id="xpack.ingestManager.epm.assetGroupTitle"
id="xpack.fleet.epm.assetGroupTitle"
defaultMessage="{assetType} assets"
values={{
assetType: ServiceTitleMap[service],

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/icons.tsx
View file

@ -9,13 +9,13 @@ import { i18n } from '@kbn/i18n';
export const UpdateIcon = ({ size = 'm' }: { size?: EuiIconProps['size'] }) => (
<EuiIconTip
aria-label={i18n.translate('xpack.ingestManager.epm.updateAvailableTooltip', {
aria-label={i18n.translate('xpack.fleet.epm.updateAvailableTooltip', {
defaultMessage: 'Update available',
})}
size={size}
type="alert"
color="warning"
content={i18n.translate('xpack.ingestManager.epm.updateAvailableTooltip', {
content={i18n.translate('xpack.fleet.epm.updateAvailableTooltip', {
defaultMessage: 'Update available',
})}
/>

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/package_list_grid.tsx
View file

@ -75,7 +75,7 @@ export function PackageListGrid({ isLoading, controls, title, list }: ListProps)
<EuiSearchBar
query={query || undefined}
box={{
placeholder: i18n.translate('xpack.ingestManager.epmList.searchPackagesPlaceholder', {
placeholder: i18n.translate('xpack.fleet.epmList.searchPackagesPlaceholder', {
defaultMessage: 'Search for integrations',
}),
incremental: true,
@ -127,7 +127,7 @@ function GridColumn({ list }: GridColumnProps) {
<EuiText>
<p>
<FormattedMessage
id="xpack.ingestManager.epmList.noPackagesFoundPlaceholder"
id="xpack.fleet.epmList.noPackagesFoundPlaceholder"
defaultMessage="No packages found"
/>
</p>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/release_badge.ts
View file

@ -7,19 +7,19 @@ import { i18n } from '@kbn/i18n';
import { RegistryRelease } from '../../../types';
export const RELEASE_BADGE_LABEL: { [key in Exclude<RegistryRelease, 'ga'>]: string } = {
beta: i18n.translate('xpack.ingestManager.epm.releaseBadge.betaLabel', {
beta: i18n.translate('xpack.fleet.epm.releaseBadge.betaLabel', {
defaultMessage: 'Beta',
}),
experimental: i18n.translate('xpack.ingestManager.epm.releaseBadge.experimentalLabel', {
experimental: i18n.translate('xpack.fleet.epm.releaseBadge.experimentalLabel', {
defaultMessage: 'Experimental',
}),
};
export const RELEASE_BADGE_DESCRIPTION: { [key in Exclude<RegistryRelease, 'ga'>]: string } = {
beta: i18n.translate('xpack.ingestManager.epm.releaseBadge.betaDescription', {
beta: i18n.translate('xpack.fleet.epm.releaseBadge.betaDescription', {
defaultMessage: 'This integration is not recommended for use in production environments.',
}),
experimental: i18n.translate('xpack.ingestManager.epm.releaseBadge.experimentalDescription', {
experimental: i18n.translate('xpack.fleet.epm.releaseBadge.experimentalDescription', {
defaultMessage: 'This integration may have breaking changes or be removed in a future release.',
}),
};

16
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/hooks/use_package_install.tsx
View file

@ -73,14 +73,14 @@ function usePackageInstall({ notifications }: { notifications: NotificationsStar
notifications.toasts.addWarning({
title: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageInstallErrorTitle"
id="xpack.fleet.integrations.packageInstallErrorTitle"
defaultMessage="Failed to install {title} package"
values={{ title }}
/>
),
text: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageInstallErrorDescription"
id="xpack.fleet.integrations.packageInstallErrorDescription"
defaultMessage="Something went wrong while trying to install this package. Please try again later."
/>
),
@ -98,14 +98,14 @@ function usePackageInstall({ notifications }: { notifications: NotificationsStar
notifications.toasts.addSuccess({
title: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageInstallSuccessTitle"
id="xpack.fleet.integrations.packageInstallSuccessTitle"
defaultMessage="Installed {title}"
values={{ title }}
/>
),
text: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageInstallSuccessDescription"
id="xpack.fleet.integrations.packageInstallSuccessDescription"
defaultMessage="Successfully installed {title}"
values={{ title }}
/>
@ -127,14 +127,14 @@ function usePackageInstall({ notifications }: { notifications: NotificationsStar
notifications.toasts.addWarning({
title: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageUninstallErrorTitle"
id="xpack.fleet.integrations.packageUninstallErrorTitle"
defaultMessage="Failed to uninstall {title} package"
values={{ title }}
/>
),
text: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageUninstallErrorDescription"
id="xpack.fleet.integrations.packageUninstallErrorDescription"
defaultMessage="Something went wrong while trying to uninstall this package. Please try again later."
/>
),
@ -146,14 +146,14 @@ function usePackageInstall({ notifications }: { notifications: NotificationsStar
notifications.toasts.addSuccess({
title: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageUninstallSuccessTitle"
id="xpack.fleet.integrations.packageUninstallSuccessTitle"
defaultMessage="Uninstalled {title}"
values={{ title }}
/>
),
text: toMountPoint(
<FormattedMessage
id="xpack.ingestManager.integrations.packageUninstallSuccessDescription"
id="xpack.fleet.integrations.packageUninstallSuccessDescription"
defaultMessage="Successfully uninstalled {title}"
values={{ title }}
/>

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_install.tsx
View file

@ -20,7 +20,7 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmInstallModal.installTitle"
id="xpack.fleet.integrations.settings.confirmInstallModal.installTitle"
defaultMessage="Install {packageName}"
values={{ packageName }}
/>
@ -29,13 +29,13 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
onConfirm={onConfirm}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmInstallModal.cancelButtonLabel"
id="xpack.fleet.integrations.settings.confirmInstallModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmInstallModal.installButtonLabel"
id="xpack.fleet.integrations.settings.confirmInstallModal.installButtonLabel"
defaultMessage="Install {packageName}"
values={{ packageName }}
/>
@ -46,7 +46,7 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
iconType="iInCircle"
title={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmInstallModal.installCalloutTitle"
id="xpack.fleet.integrations.settings.confirmInstallModal.installCalloutTitle"
defaultMessage="This action will install {numOfAssets} assets"
values={{ numOfAssets }}
/>
@ -55,7 +55,7 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
<EuiSpacer size="l" />
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmInstallModal.installDescription"
id="xpack.fleet.integrations.settings.confirmInstallModal.installDescription"
defaultMessage="Kibana assets will be installed in the current Space (Default) and will only be accessible to users who have permission to view this Space. Elasticsearch assets are installed globally and will be accessible to all Kibana users."
/>
</p>

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
View file

@ -20,7 +20,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
<EuiConfirmModal
title={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallTitle"
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle"
defaultMessage="Uninstall {packageName}"
values={{ packageName }}
/>
@ -29,13 +29,13 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
onConfirm={onConfirm}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.cancelButtonLabel"
id="xpack.fleet.integrations.settings.confirmUninstallModal.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
confirmButtonText={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallButtonLabel"
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallButtonLabel"
defaultMessage="Uninstall {packageName}"
values={{ packageName }}
/>
@ -47,7 +47,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
color="danger"
title={
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallCallout.title"
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.title"
defaultMessage="This action will remove {numOfAssets} assets"
values={{ numOfAssets }}
/>
@ -55,7 +55,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
>
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallCallout.description"
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallCallout.description"
defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents policies and any data sent by your agents will not be effected."
/>
</p>
@ -63,7 +63,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
<EuiSpacer size="l" />
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallDescription"
id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallDescription"
defaultMessage="This action cannot be undone. Are you sure you wish to continue?"
/>
</p>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/index.tsx
View file

@ -109,7 +109,7 @@ export function Detail() {
href={getHref('integrations_all')}
>
<FormattedMessage
id="xpack.ingestManager.epm.browseAllButtonText"
id="xpack.fleet.epm.browseAllButtonText"
defaultMessage="Browse all integrations"
/>
</EuiButtonEmpty>
@ -161,7 +161,7 @@ export function Detail() {
<EuiFlexGroup justifyContent="flexEnd" direction="row">
{[
{
label: i18n.translate('xpack.ingestManager.epm.versionLabel', {
label: i18n.translate('xpack.fleet.epm.versionLabel', {
defaultMessage: 'Version',
}),
content: (
@ -187,7 +187,7 @@ export function Detail() {
})}
>
<FormattedMessage
id="xpack.ingestManager.epm.addPackagePolicyButtonText"
id="xpack.fleet.epm.addPackagePolicyButtonText"
defaultMessage="Add {packageName}"
values={{
packageName: packageInfo.title,
@ -227,7 +227,7 @@ export function Detail() {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.epm.loadingIntegrationErrorTitle"
id="xpack.fleet.epm.loadingIntegrationErrorTitle"
defaultMessage="Error loading integration details"
/>
}

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/installation_button.tsx
View file

@ -66,7 +66,7 @@ export function InstallationButton(props: InstallationButtonProps) {
<EuiButton iconType={'importAction'} isLoading={isInstalling} onClick={toggleModal}>
{isInstalling ? (
<FormattedMessage
id="xpack.ingestManager.integrations.installPackage.installingPackageButtonLabel"
id="xpack.fleet.integrations.installPackage.installingPackageButtonLabel"
defaultMessage="Installing {title} assets"
values={{
title,
@ -74,7 +74,7 @@ export function InstallationButton(props: InstallationButtonProps) {
/>
) : (
<FormattedMessage
id="xpack.ingestManager.integrations.installPackage.installPackageButtonLabel"
id="xpack.fleet.integrations.installPackage.installPackageButtonLabel"
defaultMessage="Install {title} assets"
values={{
title,
@ -87,7 +87,7 @@ export function InstallationButton(props: InstallationButtonProps) {
const updateButton = (
<EuiButton iconType={'refresh'} isLoading={isInstalling} onClick={handleClickUpdate}>
<FormattedMessage
id="xpack.ingestManager.integrations.updatePackage.updatePackageButtonLabel"
id="xpack.fleet.integrations.updatePackage.updatePackageButtonLabel"
defaultMessage="Update to latest version"
/>
</EuiButton>
@ -103,7 +103,7 @@ export function InstallationButton(props: InstallationButtonProps) {
>
{isRemoving ? (
<FormattedMessage
id="xpack.ingestManager.integrations.uninstallPackage.uninstallingPackageButtonLabel"
id="xpack.fleet.integrations.uninstallPackage.uninstallingPackageButtonLabel"
defaultMessage="Uninstalling {title}"
values={{
title,
@ -111,7 +111,7 @@ export function InstallationButton(props: InstallationButtonProps) {
/>
) : (
<FormattedMessage
id="xpack.ingestManager.integrations.uninstallPackage.uninstallPackageButtonLabel"
id="xpack.fleet.integrations.uninstallPackage.uninstallPackageButtonLabel"
defaultMessage="Uninstall {title}"
values={{
title,

5
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/screenshots.tsx
View file

@ -49,10 +49,7 @@ export function Screenshots(props: ScreenshotProps) {
<Fragment>
<EuiTitle size="s">
<h3>
<FormattedMessage
id="xpack.ingestManager.epm.screenshotsTitle"
defaultMessage="Screenshots"
/>
<FormattedMessage id="xpack.fleet.epm.screenshotsTitle" defaultMessage="Screenshots" />
</h3>
</EuiTitle>
<EuiSpacer size="m" />

24
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
View file

@ -27,7 +27,7 @@ const UpdatesAvailableMsgContainer = styled.span`
const NoteLabel = () => (
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteLabel"
id="xpack.fleet.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteLabel"
defaultMessage="Note:"
/>
);
@ -35,7 +35,7 @@ const UpdatesAvailableMsg = () => (
<UpdatesAvailableMsgContainer>
<UpdateIcon size="l" />
<FormattedMessage
id="xpack.ingestManager.integrations.settings.versionInfo.updatesAvailable"
id="xpack.fleet.integrations.settings.versionInfo.updatesAvailable"
defaultMessage="Updates are available"
/>
</UpdatesAvailableMsgContainer>
@ -67,7 +67,7 @@ export const SettingsPanel = (
<EuiTitle>
<h3>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageSettingsTitle"
id="xpack.fleet.integrations.settings.packageSettingsTitle"
defaultMessage="Settings"
/>
</h3>
@ -78,7 +78,7 @@ export const SettingsPanel = (
<EuiTitle>
<h4>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageVersionTitle"
id="xpack.fleet.integrations.settings.packageVersionTitle"
defaultMessage="{title} version"
values={{
title,
@ -92,7 +92,7 @@ export const SettingsPanel = (
<tr>
<SettingsTitleCell>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.versionInfo.installedVersion"
id="xpack.fleet.integrations.settings.versionInfo.installedVersion"
defaultMessage="Installed version"
/>
</SettingsTitleCell>
@ -106,7 +106,7 @@ export const SettingsPanel = (
<tr>
<SettingsTitleCell>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.versionInfo.latestVersion"
id="xpack.fleet.integrations.settings.versionInfo.latestVersion"
defaultMessage="Latest version"
/>
</SettingsTitleCell>
@ -139,7 +139,7 @@ export const SettingsPanel = (
<EuiTitle>
<h4>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageInstallTitle"
id="xpack.fleet.integrations.settings.packageInstallTitle"
defaultMessage="Install {title}"
values={{
title,
@ -150,7 +150,7 @@ export const SettingsPanel = (
<EuiSpacer size="s" />
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageInstallDescription"
id="xpack.fleet.integrations.settings.packageInstallDescription"
defaultMessage="Install this integration to setup Kibana and Elasticsearch assets designed for {title} data."
values={{
title,
@ -163,7 +163,7 @@ export const SettingsPanel = (
<EuiTitle>
<h4>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageUninstallTitle"
id="xpack.fleet.integrations.settings.packageUninstallTitle"
defaultMessage="Uninstall {title}"
values={{
title,
@ -174,7 +174,7 @@ export const SettingsPanel = (
<EuiSpacer size="s" />
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageUninstallDescription"
id="xpack.fleet.integrations.settings.packageUninstallDescription"
defaultMessage="Remove Kibana and Elasticsearch assets that were installed by this integration."
/>
</p>
@ -193,7 +193,7 @@ export const SettingsPanel = (
{packageHasUsages && removable === true && (
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteDetail"
id="xpack.fleet.integrations.settings.packageUninstallNoteDescription.packageUninstallNoteDetail"
defaultMessage="{strongNote} {title} cannot be uninstalled because there are active agents that use this integration. To uninstall, remove all {title} integrations from your agent policies."
values={{
title,
@ -209,7 +209,7 @@ export const SettingsPanel = (
{removable === false && (
<p>
<FormattedMessage
id="xpack.ingestManager.integrations.settings.packageUninstallNoteDescription.packageUninstallUninstallableNoteDetail"
id="xpack.fleet.integrations.settings.packageUninstallNoteDescription.packageUninstallUninstallableNoteDetail"
defaultMessage="{strongNote} The {title} integration is installed by default and cannot be removed."
values={{
title,

6
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/side_nav_links.tsx
View file

@ -15,13 +15,13 @@ export type NavLinkProps = Pick<PackageInfo, 'name' | 'version'> & {
};
const PanelDisplayNames: Record<DetailViewPanelName, string> = {
overview: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.overviewLinkText', {
overview: i18n.translate('xpack.fleet.epm.packageDetailsNav.overviewLinkText', {
defaultMessage: 'Overview',
}),
usages: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.packagePoliciesLinkText', {
usages: i18n.translate('xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText', {
defaultMessage: 'Usages',
}),
settings: i18n.translate('xpack.ingestManager.epm.packageDetailsNav.settingsLinkText', {
settings: i18n.translate('xpack.fleet.epm.packageDetailsNav.settingsLinkText', {
defaultMessage: 'Settings',
}),
};

9
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/home/header.tsx
View file

@ -18,10 +18,7 @@ export const HeroCopy = memo(() => {
<EuiFlexItem grow={false}>
<EuiText>
<h1>
<FormattedMessage
id="xpack.ingestManager.epm.pageTitle"
defaultMessage="Integrations"
/>
<FormattedMessage id="xpack.fleet.epm.pageTitle" defaultMessage="Integrations" />
</h1>
</EuiText>
</EuiFlexItem>
@ -29,7 +26,7 @@ export const HeroCopy = memo(() => {
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.epm.pageSubtitle"
id="xpack.fleet.epm.pageSubtitle"
defaultMessage="Browse integrations for popular apps and services."
/>
</p>
@ -51,7 +48,7 @@ export const HeroImage = memo(() => {
return (
<Illustration
alt={i18n.translate('xpack.ingestManager.epm.illustrationAltText', {
alt={i18n.translate('xpack.fleet.epm.illustrationAltText', {
defaultMessage: 'Illustration of an integration',
})}
url={

14
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/home/index.tsx
View file

@ -30,7 +30,7 @@ export function EPMHomePage() {
([
{
id: 'all_packages',
name: i18n.translate('xpack.ingestManager.epmList.allTabText', {
name: i18n.translate('xpack.fleet.epmList.allTabText', {
defaultMessage: 'All integrations',
}),
href: getHref('integrations_all'),
@ -38,7 +38,7 @@ export function EPMHomePage() {
},
{
id: 'installed_packages',
name: i18n.translate('xpack.ingestManager.epmList.installedTabText', {
name: i18n.translate('xpack.fleet.epmList.installedTabText', {
defaultMessage: 'Installed integrations',
}),
href: getHref('integrations_installed'),
@ -66,7 +66,7 @@ function InstalledPackages() {
});
const [selectedCategory, setSelectedCategory] = useState('');
const title = i18n.translate('xpack.ingestManager.epmList.installedTitle', {
const title = i18n.translate('xpack.fleet.epmList.installedTitle', {
defaultMessage: 'Installed integrations',
});
@ -82,14 +82,14 @@ function InstalledPackages() {
const categories = [
{
id: '',
title: i18n.translate('xpack.ingestManager.epmList.allFilterLinkText', {
title: i18n.translate('xpack.fleet.epmList.allFilterLinkText', {
defaultMessage: 'All',
}),
count: allInstalledPackages.length,
},
{
id: 'updates_available',
title: i18n.translate('xpack.ingestManager.epmList.updatesAvailableFilterLinkText', {
title: i18n.translate('xpack.fleet.epmList.updatesAvailableFilterLinkText', {
defaultMessage: 'Updates available',
}),
count: updatablePackages.length,
@ -128,14 +128,14 @@ function AvailablePackages() {
const packages =
categoryPackagesRes && categoryPackagesRes.response ? categoryPackagesRes.response : [];
const title = i18n.translate('xpack.ingestManager.epmList.allTitle', {
const title = i18n.translate('xpack.fleet.epmList.allTitle', {
defaultMessage: 'Browse by category',
});
const categories = [
{
id: '',
title: i18n.translate('xpack.ingestManager.epmList.allPackagesFilterLinkText', {
title: i18n.translate('xpack.fleet.epmList.allPackagesFilterLinkText', {
defaultMessage: 'All',
}),
count: allPackagesRes?.response?.length || 0,

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/actions_menu.tsx
View file

@ -76,7 +76,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
props: { iconType: 'arrowDown', iconSide: 'right' },
children: (
<FormattedMessage
id="xpack.ingestManager.agentDetails.actionsButton"
id="xpack.fleet.agentDetails.actionsButton"
defaultMessage="Actions"
/>
),
@ -91,7 +91,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
key="reassignPolicy"
>
<FormattedMessage
id="xpack.ingestManager.agentList.reassignActionText"
id="xpack.fleet.agentList.reassignActionText"
defaultMessage="Assign to new policy"
/>
</EuiContextMenuItem>,
@ -104,12 +104,12 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
>
{isUnenrolling ? (
<FormattedMessage
id="xpack.ingestManager.agentList.forceUnenrollOneButton"
id="xpack.fleet.agentList.forceUnenrollOneButton"
defaultMessage="Force unenroll"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
id="xpack.fleet.agentList.unenrollOneButton"
defaultMessage="Unenroll agent"
/>
)}
@ -122,7 +122,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.upgradeOneButton"
id="xpack.fleet.agentList.upgradeOneButton"
defaultMessage="Upgrade agent"
/>
</EuiContextMenuItem>,

16
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_details.tsx
View file

@ -31,7 +31,7 @@ export const AgentDetailsContent: React.FunctionComponent<{
<EuiDescriptionList>
{[
{
title: i18n.translate('xpack.ingestManager.agentDetails.hostNameLabel', {
title: i18n.translate('xpack.fleet.agentDetails.hostNameLabel', {
defaultMessage: 'Host name',
}),
description:
@ -41,19 +41,19 @@ export const AgentDetailsContent: React.FunctionComponent<{
: '-',
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.hostIdLabel', {
title: i18n.translate('xpack.fleet.agentDetails.hostIdLabel', {
defaultMessage: 'Agent ID',
}),
description: agent.id,
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.statusLabel', {
title: i18n.translate('xpack.fleet.agentDetails.statusLabel', {
defaultMessage: 'Status',
}),
description: <AgentHealth agent={agent} />,
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.agentPolicyLabel', {
title: i18n.translate('xpack.fleet.agentDetails.agentPolicyLabel', {
defaultMessage: 'Agent policy',
}),
description: agentPolicy ? (
@ -68,7 +68,7 @@ export const AgentDetailsContent: React.FunctionComponent<{
),
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.versionLabel', {
title: i18n.translate('xpack.fleet.agentDetails.versionLabel', {
defaultMessage: 'Agent version',
}),
description:
@ -85,7 +85,7 @@ export const AgentDetailsContent: React.FunctionComponent<{
<EuiIcon size="m" type="alert" color="warning" />
&nbsp;
<FormattedMessage
id="xpack.ingestManager.agentList.agentUpgradeLabel"
id="xpack.fleet.agentList.agentUpgradeLabel"
defaultMessage="Upgrade available"
/>
</EuiText>
@ -97,7 +97,7 @@ export const AgentDetailsContent: React.FunctionComponent<{
),
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.releaseLabel', {
title: i18n.translate('xpack.fleet.agentDetails.releaseLabel', {
defaultMessage: 'Agent release',
}),
description:
@ -110,7 +110,7 @@ export const AgentDetailsContent: React.FunctionComponent<{
: '-',
},
{
title: i18n.translate('xpack.ingestManager.agentDetails.platformLabel', {
title: i18n.translate('xpack.fleet.agentDetails.platformLabel', {
defaultMessage: 'Platform',
}),
description:

25
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/agent_events_table.tsx
View file

@ -78,7 +78,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
<EuiText size="s">
<strong>
<FormattedMessage
id="xpack.ingestManager.agentEventsList.messageDetailsTitle"
id="xpack.fleet.agentEventsList.messageDetailsTitle"
defaultMessage="Message"
/>
</strong>
@ -92,7 +92,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
<EuiText size="s">
<strong>
<FormattedMessage
id="xpack.ingestManager.agentEventsList.payloadDetailsTitle"
id="xpack.fleet.agentEventsList.payloadDetailsTitle"
defaultMessage="Payload"
/>
</strong>
@ -113,7 +113,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
const columns = [
{
field: 'timestamp',
name: i18n.translate('xpack.ingestManager.agentEventsList.timestampColumnTitle', {
name: i18n.translate('xpack.fleet.agentEventsList.timestampColumnTitle', {
defaultMessage: 'Timestamp',
}),
render: (timestamp: string) => (
@ -132,7 +132,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
},
{
field: 'type',
name: i18n.translate('xpack.ingestManager.agentEventsList.typeColumnTitle', {
name: i18n.translate('xpack.fleet.agentEventsList.typeColumnTitle', {
defaultMessage: 'Type',
}),
width: '10%',
@ -141,7 +141,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
},
{
field: 'subtype',
name: i18n.translate('xpack.ingestManager.agentEventsList.subtypeColumnTitle', {
name: i18n.translate('xpack.fleet.agentEventsList.subtypeColumnTitle', {
defaultMessage: 'Subtype',
}),
width: '13%',
@ -150,7 +150,7 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
},
{
field: 'message',
name: i18n.translate('xpack.ingestManager.agentEventsList.messageColumnTitle', {
name: i18n.translate('xpack.fleet.agentEventsList.messageColumnTitle', {
defaultMessage: 'Message',
}),
render: (value: string) => (
@ -168,10 +168,10 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
onClick={() => toggleDetails(agentEvent)}
aria-label={
itemIdToExpandedRowMap[agentEvent.id]
? i18n.translate('xpack.ingestManager.agentEventsList.collapseDetailsAriaLabel', {
? i18n.translate('xpack.fleet.agentEventsList.collapseDetailsAriaLabel', {
defaultMessage: 'Hide details',
})
: i18n.translate('xpack.ingestManager.agentEventsList.expandDetailsAriaLabel', {
: i18n.translate('xpack.fleet.agentEventsList.expandDetailsAriaLabel', {
defaultMessage: 'Show details',
})
}
@ -203,16 +203,15 @@ export const AgentEventsTable: React.FunctionComponent<{ agent: Agent }> = ({ ag
value={search}
onChange={setSearch}
fieldPrefix={AGENT_EVENT_SAVED_OBJECT_TYPE}
placeholder={i18n.translate(
'xpack.ingestManager.agentEventsList.searchPlaceholderText',
{ defaultMessage: 'Search for activity logs' }
)}
placeholder={i18n.translate('xpack.fleet.agentEventsList.searchPlaceholderText', {
defaultMessage: 'Search for activity logs',
})}
/>
</EuiFlexItem>
<EuiFlexItem grow={null}>
<EuiButton iconType="refresh" onClick={onClickRefresh}>
<FormattedMessage
id="xpack.ingestManager.agentEventsList.refreshButton"
id="xpack.fleet.agentEventsList.refreshButton"
defaultMessage="Refresh"
/>
</EuiButton>

6
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/metadata_flyout.tsx
View file

@ -41,7 +41,7 @@ export const AgentMetadataFlyout: React.FunctionComponent<Props> = ({ agent, fly
<EuiTitle size="m">
<h2 id="flyoutTitle">
<FormattedMessage
id="xpack.ingestManager.agentDetails.metadataSectionTitle"
id="xpack.fleet.agentDetails.metadataSectionTitle"
defaultMessage="Metadata"
/>
</h2>
@ -51,7 +51,7 @@ export const AgentMetadataFlyout: React.FunctionComponent<Props> = ({ agent, fly
<EuiTitle size="s">
<h3>
<FormattedMessage
id="xpack.ingestManager.agentDetails.localMetadataSectionSubtitle"
id="xpack.fleet.agentDetails.localMetadataSectionSubtitle"
defaultMessage="Local metadata"
/>
</h3>
@ -62,7 +62,7 @@ export const AgentMetadataFlyout: React.FunctionComponent<Props> = ({ agent, fly
<EuiTitle size="s">
<h3>
<FormattedMessage
id="xpack.ingestManager.agentDetails.userProvidedMetadataSectionSubtitle"
id="xpack.fleet.agentDetails.userProvidedMetadataSectionSubtitle"
defaultMessage="User provided metadata"
/>
</h3>

11
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/metadata_form.tsx
View file

@ -106,10 +106,7 @@ export const MetadataForm: React.FunctionComponent<{ agent: Agent }> = ({ agent
const button = (
<EuiButtonEmpty onClick={() => setOpen(true)} color={'text'}>
<FormattedMessage
id="xpack.ingestManager.metadataForm.addButton"
defaultMessage="+ Add metadata"
/>
<FormattedMessage id="xpack.fleet.metadataForm.addButton" defaultMessage="+ Add metadata" />
</EuiButtonEmpty>
);
return (
@ -128,7 +125,7 @@ export const MetadataForm: React.FunctionComponent<{ agent: Agent }> = ({ agent
<EuiFlexItem>
<EuiFormRow
id="fleet-details-metadata-form"
label={i18n.translate('xpack.ingestManager.metadataForm.keyLabel', {
label={i18n.translate('xpack.fleet.metadataForm.keyLabel', {
defaultMessage: 'Key',
})}
>
@ -137,7 +134,7 @@ export const MetadataForm: React.FunctionComponent<{ agent: Agent }> = ({ agent
</EuiFlexItem>
<EuiFlexItem>
<EuiFormRow
label={i18n.translate('xpack.ingestManager.metadataForm.valueLabel', {
label={i18n.translate('xpack.fleet.metadataForm.valueLabel', {
defaultMessage: 'Value',
})}
>
@ -148,7 +145,7 @@ export const MetadataForm: React.FunctionComponent<{ agent: Agent }> = ({ agent
<EuiFormRow hasEmptyLabelSpace>
<EuiButton isLoading={form.state.isLoading} type={'submit'}>
<FormattedMessage
id="xpack.ingestManager.metadataForm.submitButtonText"
id="xpack.fleet.metadataForm.submitButtonText"
defaultMessage="Add"
/>
</EuiButton>

50
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
View file

@ -12,28 +12,25 @@ import { AgentEvent } from '../../../../types';
export const TYPE_LABEL: { [key in AgentEvent['type']]: JSX.Element } = {
STATE: (
<EuiBadge color="hollow">
<FormattedMessage id="xpack.ingestManager.agentEventType.stateLabel" defaultMessage="State" />
<FormattedMessage id="xpack.fleet.agentEventType.stateLabel" defaultMessage="State" />
</EuiBadge>
),
ERROR: (
<EuiBadge color="danger">
<FormattedMessage id="xpack.ingestManager.agentEventType.errorLabel" defaultMessage="Error" />
<FormattedMessage id="xpack.fleet.agentEventType.errorLabel" defaultMessage="Error" />
</EuiBadge>
),
ACTION_RESULT: (
<EuiBadge color="secondary">
<FormattedMessage
id="xpack.ingestManager.agentEventType.actionResultLabel"
id="xpack.fleet.agentEventType.actionResultLabel"
defaultMessage="Action result"
/>
</EuiBadge>
),
ACTION: (
<EuiBadge color="primary">
<FormattedMessage
id="xpack.ingestManager.agentEventType.actionLabel"
defaultMessage="Action"
/>
<FormattedMessage id="xpack.fleet.agentEventType.actionLabel" defaultMessage="Action" />
</EuiBadge>
),
};
@ -41,16 +38,13 @@ export const TYPE_LABEL: { [key in AgentEvent['type']]: JSX.Element } = {
export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
RUNNING: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.runningLabel"
defaultMessage="Running"
/>
<FormattedMessage id="xpack.fleet.agentEventSubtype.runningLabel" defaultMessage="Running" />
</EuiBadge>
),
STARTING: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.startingLabel"
id="xpack.fleet.agentEventSubtype.startingLabel"
defaultMessage="Starting"
/>
</EuiBadge>
@ -58,47 +52,38 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
IN_PROGRESS: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.inProgressLabel"
id="xpack.fleet.agentEventSubtype.inProgressLabel"
defaultMessage="In progress"
/>
</EuiBadge>
),
CONFIG: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.policyLabel"
defaultMessage="Policy"
/>
<FormattedMessage id="xpack.fleet.agentEventSubtype.policyLabel" defaultMessage="Policy" />
</EuiBadge>
),
FAILED: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.failedLabel"
defaultMessage="Failed"
/>
<FormattedMessage id="xpack.fleet.agentEventSubtype.failedLabel" defaultMessage="Failed" />
</EuiBadge>
),
STOPPING: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.stoppingLabel"
id="xpack.fleet.agentEventSubtype.stoppingLabel"
defaultMessage="Stopping"
/>
</EuiBadge>
),
STOPPED: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.stoppedLabel"
defaultMessage="Stopped"
/>
<FormattedMessage id="xpack.fleet.agentEventSubtype.stoppedLabel" defaultMessage="Stopped" />
</EuiBadge>
),
DEGRADED: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.degradedLabel"
id="xpack.fleet.agentEventSubtype.degradedLabel"
defaultMessage="Degraded"
/>
</EuiBadge>
@ -106,7 +91,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
DATA_DUMP: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.dataDumpLabel"
id="xpack.fleet.agentEventSubtype.dataDumpLabel"
defaultMessage="Data dump"
/>
</EuiBadge>
@ -114,7 +99,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
ACKNOWLEDGED: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.acknowledgedLabel"
id="xpack.fleet.agentEventSubtype.acknowledgedLabel"
defaultMessage="Acknowledged"
/>
</EuiBadge>
@ -122,17 +107,14 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
UPDATING: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.updatingLabel"
id="xpack.fleet.agentEventSubtype.updatingLabel"
defaultMessage="Updating"
/>
</EuiBadge>
),
UNKNOWN: (
<EuiBadge color="hollow">
<FormattedMessage
id="xpack.ingestManager.agentEventSubtype.unknownLabel"
defaultMessage="Unknown"
/>
<FormattedMessage id="xpack.fleet.agentEventSubtype.unknownLabel" defaultMessage="Unknown" />
</EuiBadge>
),
};

37
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/index.tsx
View file

@ -89,7 +89,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
size="xs"
>
<FormattedMessage
id="xpack.ingestManager.agentDetails.viewAgentListTitle"
id="xpack.fleet.agentDetails.viewAgentListTitle"
defaultMessage="View all agents"
/>
</EuiButtonEmpty>
@ -104,7 +104,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
agentData.item.local_metadata.host.hostname
) : (
<FormattedMessage
id="xpack.ingestManager.agentDetails.agentDetailsTitle"
id="xpack.fleet.agentDetails.agentDetailsTitle"
defaultMessage="Agent '{id}'"
values={{
id: agentId,
@ -125,14 +125,14 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
<EuiFlexGroup justifyContent={'flexEnd'} direction="row">
{[
{
label: i18n.translate('xpack.ingestManager.agentDetails.statusLabel', {
label: i18n.translate('xpack.fleet.agentDetails.statusLabel', {
defaultMessage: 'Status',
}),
content: <AgentHealth agent={agentData.item} />,
},
{ isDivider: true },
{
label: i18n.translate('xpack.ingestManager.agentDetails.policyLabel', {
label: i18n.translate('xpack.fleet.agentDetails.policyLabel', {
defaultMessage: 'Policy',
}),
content: isAgentPolicyLoading ? (
@ -150,7 +150,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
},
{ isDivider: true },
{
label: i18n.translate('xpack.ingestManager.agentDetails.agentVersionLabel', {
label: i18n.translate('xpack.fleet.agentDetails.agentVersionLabel', {
defaultMessage: 'Agent version',
}),
content:
@ -165,7 +165,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
<EuiIconTip
aria-label={i18n.translate(
'xpack.ingestManager.agentDetails.upgradeAvailableTooltip',
'xpack.fleet.agentDetails.upgradeAvailableTooltip',
{
defaultMessage: 'Upgrade available',
}
@ -174,7 +174,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
type="alert"
color="warning"
content={i18n.translate(
'xpack.ingestManager.agentDetails.upgradeAvailableTooltip',
'xpack.fleet.agentDetails.upgradeAvailableTooltip',
{
defaultMessage: 'Upgrade available',
}
@ -225,7 +225,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
return [
{
id: 'activity_log',
name: i18n.translate('xpack.ingestManager.agentDetails.subTabs.activityLogTab', {
name: i18n.translate('xpack.fleet.agentDetails.subTabs.activityLogTab', {
defaultMessage: 'Activity log',
}),
href: getHref('fleet_agent_details', { agentId, tabId: 'activity' }),
@ -233,7 +233,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
},
{
id: 'details',
name: i18n.translate('xpack.ingestManager.agentDetails.subTabs.detailsTab', {
name: i18n.translate('xpack.fleet.agentDetails.subTabs.detailsTab', {
defaultMessage: 'Agent details',
}),
href: getHref('fleet_agent_details', { agentId, tabId: 'details' }),
@ -262,7 +262,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.agentDetails.unexceptedErrorTitle"
id="xpack.fleet.agentDetails.unexceptedErrorTitle"
defaultMessage="Error loading agent"
/>
}
@ -274,19 +274,16 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
<Error
title={
<FormattedMessage
id="xpack.ingestManager.agentDetails.agentNotFoundErrorTitle"
id="xpack.fleet.agentDetails.agentNotFoundErrorTitle"
defaultMessage="Agent not found"
/>
}
error={i18n.translate(
'xpack.ingestManager.agentDetails.agentNotFoundErrorDescription',
{
defaultMessage: 'Cannot find agent ID {agentId}',
values: {
agentId,
},
}
)}
error={i18n.translate('xpack.fleet.agentDetails.agentNotFoundErrorDescription', {
defaultMessage: 'Cannot find agent ID {agentId}',
values: {
agentId,
},
})}
/>
)}
</WithHeaderLayout>

16
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/bulk_actions.tsx
View file

@ -88,7 +88,7 @@ export const AgentBulkActions: React.FunctionComponent<{
{
name: (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.reassignPolicy"
id="xpack.fleet.agentBulkActions.reassignPolicy"
defaultMessage="Assign to new policy"
/>
),
@ -102,7 +102,7 @@ export const AgentBulkActions: React.FunctionComponent<{
{
name: (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.unenrollAgents"
id="xpack.fleet.agentBulkActions.unenrollAgents"
defaultMessage="Unenroll agents"
/>
),
@ -116,7 +116,7 @@ export const AgentBulkActions: React.FunctionComponent<{
{
name: (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.upgradeAgents"
id="xpack.fleet.agentBulkActions.upgradeAgents"
defaultMessage="Upgrade agents"
/>
),
@ -130,7 +130,7 @@ export const AgentBulkActions: React.FunctionComponent<{
{
name: (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.clearSelection"
id="xpack.fleet.agentBulkActions.clearSelection"
defaultMessage="Clear selection"
/>
),
@ -192,7 +192,7 @@ export const AgentBulkActions: React.FunctionComponent<{
<EuiText size="xs" color="subdued">
{totalAgents > SO_SEARCH_LIMIT ? (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.totalAgentsWithLimit"
id="xpack.fleet.agentBulkActions.totalAgentsWithLimit"
defaultMessage="Showing {count} of {total} agents"
values={{
count: <FormattedNumber value={SO_SEARCH_LIMIT} />,
@ -201,7 +201,7 @@ export const AgentBulkActions: React.FunctionComponent<{
/>
) : (
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.totalAgents"
id="xpack.fleet.agentBulkActions.totalAgents"
defaultMessage="Showing {count, plural, one {# agent} other {# agents}}"
values={{ count: totalAgents }}
/>
@ -226,7 +226,7 @@ export const AgentBulkActions: React.FunctionComponent<{
onClick={openMenu}
>
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.agentsSelected"
id="xpack.fleet.agentBulkActions.agentsSelected"
defaultMessage="{count, plural, one {# agent} other {# agents}} selected"
values={{
count:
@ -257,7 +257,7 @@ export const AgentBulkActions: React.FunctionComponent<{
onClick={() => setSelectionMode('query')}
>
<FormattedMessage
id="xpack.ingestManager.agentBulkActions.selectAll"
id="xpack.fleet.agentBulkActions.selectAll"
defaultMessage="Select everything on all pages"
/>
</Button>

60
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
View file

@ -53,26 +53,26 @@ const REFRESH_INTERVAL_MS = 5000;
const statusFilters = [
{
status: 'online',
label: i18n.translate('xpack.ingestManager.agentList.statusOnlineFilterText', {
label: i18n.translate('xpack.fleet.agentList.statusOnlineFilterText', {
defaultMessage: 'Online',
}),
},
{
status: 'offline',
label: i18n.translate('xpack.ingestManager.agentList.statusOfflineFilterText', {
label: i18n.translate('xpack.fleet.agentList.statusOfflineFilterText', {
defaultMessage: 'Offline',
}),
},
,
{
status: 'error',
label: i18n.translate('xpack.ingestManager.agentList.statusErrorFilterText', {
label: i18n.translate('xpack.fleet.agentList.statusErrorFilterText', {
defaultMessage: 'Error',
}),
},
{
status: 'updating',
label: i18n.translate('xpack.ingestManager.agentList.statusUpdatingFilterText', {
label: i18n.translate('xpack.fleet.agentList.statusUpdatingFilterText', {
defaultMessage: 'Updating',
}),
},
@ -101,10 +101,7 @@ const RowActions = React.memo<{
href={getHref('fleet_agent_details', { agentId: agent.id })}
key="viewAgent"
>
<FormattedMessage
id="xpack.ingestManager.agentList.viewActionText"
defaultMessage="View agent"
/>
<FormattedMessage id="xpack.fleet.agentList.viewActionText" defaultMessage="View agent" />
</EuiContextMenuItem>,
<EuiContextMenuItem
icon="pencil"
@ -115,7 +112,7 @@ const RowActions = React.memo<{
key="reassignPolicy"
>
<FormattedMessage
id="xpack.ingestManager.agentList.reassignActionText"
id="xpack.fleet.agentList.reassignActionText"
defaultMessage="Assign to new policy"
/>
</EuiContextMenuItem>,
@ -128,12 +125,12 @@ const RowActions = React.memo<{
>
{isUnenrolling ? (
<FormattedMessage
id="xpack.ingestManager.agentList.forceUnenrollOneButton"
id="xpack.fleet.agentList.forceUnenrollOneButton"
defaultMessage="Force unenroll"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
id="xpack.fleet.agentList.unenrollOneButton"
defaultMessage="Unenroll agent"
/>
)}
@ -146,7 +143,7 @@ const RowActions = React.memo<{
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.upgradeOneButton"
id="xpack.fleet.agentList.upgradeOneButton"
defaultMessage="Upgrade agent"
/>
</EuiContextMenuItem>,
@ -294,7 +291,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
const columns = [
{
field: 'local_metadata.host.hostname',
name: i18n.translate('xpack.ingestManager.agentList.hostColumnTitle', {
name: i18n.translate('xpack.fleet.agentList.hostColumnTitle', {
defaultMessage: 'Host',
}),
render: (host: string, agent: Agent) => (
@ -306,14 +303,14 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
{
field: 'active',
width: '120px',
name: i18n.translate('xpack.ingestManager.agentList.statusColumnTitle', {
name: i18n.translate('xpack.fleet.agentList.statusColumnTitle', {
defaultMessage: 'Status',
}),
render: (active: boolean, agent: any) => <AgentHealth agent={agent} />,
},
{
field: 'policy_id',
name: i18n.translate('xpack.ingestManager.agentList.policyColumnTitle', {
name: i18n.translate('xpack.fleet.agentList.policyColumnTitle', {
defaultMessage: 'Agent policy',
}),
render: (policyId: string, agent: Agent) => {
@ -333,7 +330,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
<EuiFlexItem grow={false}>
<EuiText color="default" size="xs" className="eui-textNoWrap">
<FormattedMessage
id="xpack.ingestManager.agentList.revisionNumber"
id="xpack.fleet.agentList.revisionNumber"
defaultMessage="rev. {revNumber}"
values={{ revNumber: agent.policy_revision }}
/>
@ -351,7 +348,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
{true && (
<>
<FormattedMessage
id="xpack.ingestManager.agentList.outOfDateLabel"
id="xpack.fleet.agentList.outOfDateLabel"
defaultMessage="Out-of-date"
/>
</>
@ -366,7 +363,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
{
field: 'local_metadata.elastic.agent.version',
width: '200px',
name: i18n.translate('xpack.ingestManager.agentList.versionTitle', {
name: i18n.translate('xpack.fleet.agentList.versionTitle', {
defaultMessage: 'Version',
}),
render: (version: string, agent: Agent) => (
@ -380,7 +377,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
<EuiIcon size="m" type="alert" color="warning" />
&nbsp;
<FormattedMessage
id="xpack.ingestManager.agentList.agentUpgradeLabel"
id="xpack.fleet.agentList.agentUpgradeLabel"
defaultMessage="Upgrade available"
/>
</EuiText>
@ -391,14 +388,14 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'last_checkin',
name: i18n.translate('xpack.ingestManager.agentList.lastCheckinTitle', {
name: i18n.translate('xpack.fleet.agentList.lastCheckinTitle', {
defaultMessage: 'Last activity',
}),
render: (lastCheckin: string, agent: any) =>
lastCheckin ? <FormattedRelative value={lastCheckin} /> : null,
},
{
name: i18n.translate('xpack.ingestManager.agentList.actionsColumnTitle', {
name: i18n.translate('xpack.fleet.agentList.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
@ -425,7 +422,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
title={
<h2>
<FormattedMessage
id="xpack.ingestManager.agentList.noAgentsPrompt"
id="xpack.fleet.agentList.noAgentsPrompt"
defaultMessage="No agents enrolled"
/>
</h2>
@ -433,10 +430,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
actions={
hasWriteCapabilites ? (
<EuiButton fill iconType="plusInCircle" onClick={() => setIsEnrollmentFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.agentList.addButton"
defaultMessage="Add agent"
/>
<FormattedMessage id="xpack.fleet.agentList.addButton" defaultMessage="Add agent" />
</EuiButton>
) : null
}
@ -521,7 +515,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
disabled={isAgentPoliciesLoading}
>
<FormattedMessage
id="xpack.ingestManager.agentList.statusFilterText"
id="xpack.fleet.agentList.statusFilterText"
defaultMessage="Status"
/>
</EuiFilterButton>
@ -561,7 +555,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
disabled={isAgentPoliciesLoading}
>
<FormattedMessage
id="xpack.ingestManager.agentList.policyFilterText"
id="xpack.fleet.agentList.policyFilterText"
defaultMessage="Agent policy"
/>
</EuiFilterButton>
@ -595,7 +589,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.showUpgradeableFilterLabel"
id="xpack.fleet.agentList.showUpgradeableFilterLabel"
defaultMessage="Upgrade available"
/>
</EuiFilterButton>
@ -604,7 +598,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
onClick={() => setShowInactive(!showInactive)}
>
<FormattedMessage
id="xpack.ingestManager.agentList.showInactiveSwitchLabel"
id="xpack.fleet.agentList.showInactiveSwitchLabel"
defaultMessage="Inactive"
/>
</EuiFilterButton>
@ -645,18 +639,18 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
noItemsMessage={
isLoading && agentsRequest.isInitialRequest ? (
<FormattedMessage
id="xpack.ingestManager.agentList.loadingAgentsMessage"
id="xpack.fleet.agentList.loadingAgentsMessage"
defaultMessage="Loading agents…"
/>
) : isUsingFilter ? (
<FormattedMessage
id="xpack.ingestManager.agentList.noFilteredAgentsPrompt"
id="xpack.fleet.agentList.noFilteredAgentsPrompt"
defaultMessage="No agents found. {clearFiltersLink}"
values={{
clearFiltersLink: (
<EuiLink onClick={() => clearFilters()}>
<FormattedMessage
id="xpack.ingestManager.agentList.clearFiltersLinkText"
id="xpack.fleet.agentList.clearFiltersLinkText"
defaultMessage="Clear filters"
/>
</EuiLink>

13
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
View file

@ -155,7 +155,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
prepend={
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentStepAgentPolicy.policySelectLabel"
id="xpack.fleet.enrollmentStepAgentPolicy.policySelectLabel"
defaultMessage="Agent policy"
/>
</EuiText>
@ -172,10 +172,9 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
enrollmentAPIKeyId: undefined,
})
}
aria-label={i18n.translate(
'xpack.ingestManager.enrollmentStepAgentPolicy.policySelectAriaLabel',
{ defaultMessage: 'Agent policy' }
)}
aria-label={i18n.translate('xpack.fleet.enrollmentStepAgentPolicy.policySelectAriaLabel', {
defaultMessage: 'Agent policy',
})}
/>
<EuiSpacer size="m" />
{selectedState.agentPolicyId && (
@ -190,7 +189,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
onClick={() => setIsAuthenticationSettingsOpen(!isAuthenticationSettingsOpen)}
>
<FormattedMessage
id="xpack.ingestManager.enrollmentStepAgentPolicy.showAuthenticationSettingsButton"
id="xpack.fleet.enrollmentStepAgentPolicy.showAuthenticationSettingsButton"
defaultMessage="Authentication settings"
/>
</EuiButtonEmpty>
@ -207,7 +206,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
prepend={
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
id="xpack.fleet.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
defaultMessage="Enrollment token"
/>
</EuiText>

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
View file

@ -41,7 +41,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiTitle size="m">
<h2 id="FleetAgentEnrollmentFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.flyoutTitle"
id="xpack.fleet.agentEnrollment.flyoutTitle"
defaultMessage="Add agent"
/>
</h2>
@ -49,7 +49,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiSpacer size="l" />
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.agentDescription"
id="xpack.fleet.agentEnrollment.agentDescription"
defaultMessage="Add Elastic Agents to your hosts to collect data and send it to the Elastic Stack."
/>
</EuiText>
@ -57,13 +57,13 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiTabs style={{ marginBottom: '-25px' }}>
<EuiTab isSelected={mode === 'managed'} onClick={() => setMode('managed')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.enrollFleetTabLabel"
id="xpack.fleet.agentEnrollment.enrollFleetTabLabel"
defaultMessage="Enroll in Fleet"
/>
</EuiTab>
<EuiTab isSelected={mode === 'standalone'} onClick={() => setMode('standalone')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel"
id="xpack.fleet.agentEnrollment.enrollStandaloneTabLabel"
defaultMessage="Run standalone"
/>
</EuiTab>
@ -82,7 +82,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.cancelButtonLabel"
id="xpack.fleet.agentEnrollment.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -90,7 +90,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem grow={false}>
<EuiButton fill onClick={onClose}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.continueButtonLabel"
id="xpack.fleet.agentEnrollment.continueButtonLabel"
defaultMessage="Continue"
/>
</EuiButton>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
View file

@ -45,7 +45,7 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
DownloadStep(),
AgentPolicySelectionStep({ agentPolicies, setSelectedAPIKeyId }),
{
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepEnrollAndRunAgentTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
defaultMessage: 'Enroll and start the Elastic Agent',
}),
children: apiKey.data && (
@ -62,7 +62,7 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.managedDescription"
id="xpack.fleet.agentEnrollment.managedDescription"
defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
/>
</EuiText>
@ -74,13 +74,13 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
) : (
<>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.agentsNotInitializedText"
id="xpack.fleet.agentEnrollment.agentsNotInitializedText"
defaultMessage="Before enrolling agents, {link}."
values={{
link: (
<EuiLink href={getHref('fleet')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.setUpAgentsLink"
id="xpack.fleet.agentEnrollment.setUpAgentsLink"
defaultMessage="set up central management for Elastic Agents"
/>
</EuiLink>

22
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
View file

@ -75,14 +75,14 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
DownloadStep(),
AgentPolicySelectionStep({ agentPolicies, setSelectedPolicyId }),
{
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepConfigureAgentTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepConfigureAgentTitle', {
defaultMessage: 'Configure the agent',
}),
children: (
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription"
id="xpack.fleet.agentEnrollment.stepConfigureAgentDescription"
defaultMessage="Copy this policy to the {fileName} on the host where the Elastic Agent is installed. Modify {ESUsernameVariable} and {ESPasswordVariable} in the {outputSection} section of {fileName} to use your Elasticsearch credentials."
values={{
fileName: <EuiCode>elastic-agent.yml</EuiCode>,
@ -98,7 +98,7 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
{(copy) => (
<EuiButton onClick={copy} iconType="copyClipboard">
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.copyPolicyButton"
id="xpack.fleet.agentEnrollment.copyPolicyButton"
defaultMessage="Copy to clipboard"
/>
</EuiButton>
@ -108,7 +108,7 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
<EuiFlexItem grow={false}>
<EuiButton iconType="download" href={downloadLink} isDisabled={!downloadLink}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.downloadPolicyButton"
id="xpack.fleet.agentEnrollment.downloadPolicyButton"
defaultMessage="Download policy"
/>
</EuiButton>
@ -123,14 +123,14 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
),
},
{
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepRunAgentTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepRunAgentTitle', {
defaultMessage: 'Start the agent',
}),
children: (
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepRunAgentDescription"
id="xpack.fleet.agentEnrollment.stepRunAgentDescription"
defaultMessage="From the agent directory, run this command to install, enroll and start an Elastic Agent. You can reuse this command to set up agents on more than one host. Requires administrator privileges."
/>
<EuiSpacer size="m" />
@ -140,7 +140,7 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
{(copy) => (
<EuiButton onClick={copy} iconType="copyClipboard">
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.copyRunInstructionsButton"
id="xpack.fleet.agentEnrollment.copyRunInstructionsButton"
defaultMessage="Copy to clipboard"
/>
</EuiButton>
@ -151,20 +151,20 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
),
},
{
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepCheckForDataTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepCheckForDataTitle', {
defaultMessage: 'Check for data',
}),
children: (
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
id="xpack.fleet.agentEnrollment.stepCheckForDataDescription"
defaultMessage="The agent should begin sending data. Go to {link} to view your data."
values={{
link: (
<EuiLink href={getHref('data_streams')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.goToDataStreamsLink"
id="xpack.fleet.agentEnrollment.goToDataStreamsLink"
defaultMessage="data streams"
/>
</EuiLink>
@ -181,7 +181,7 @@ export const StandaloneInstructions = React.memo<Props>(({ agentPolicies }) => {
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.standaloneDescription"
id="xpack.fleet.agentEnrollment.standaloneDescription"
defaultMessage="Run an Elastic Agent standalone to configure and update the agent manually on the host where the agent is installed."
/>
</EuiText>

8
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/steps.tsx
View file

@ -13,14 +13,14 @@ import { AgentPolicy } from '../../../../types';
export const DownloadStep = () => {
return {
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepDownloadAgentTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentTitle', {
defaultMessage: 'Download the Elastic Agent to your host',
}),
children: (
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.downloadDescription"
id="xpack.fleet.agentEnrollment.downloadDescription"
defaultMessage="You can download the agent binaries and their verification signatures from the Elastic Agent download page."
/>
</EuiText>
@ -32,7 +32,7 @@ export const DownloadStep = () => {
iconType="popout"
>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.downloadLink"
id="xpack.fleet.agentEnrollment.downloadLink"
defaultMessage="Go to download page"
/>
</EuiButton>
@ -51,7 +51,7 @@ export const AgentPolicySelectionStep = ({
setSelectedPolicyId?: (policyId: string) => void;
}) => {
return {
title: i18n.translate('xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle', {
title: i18n.translate('xpack.fleet.agentEnrollment.stepChooseAgentPolicyTitle', {
defaultMessage: 'Choose an agent policy',
}),
children: (

43
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_health.tsx
View file

@ -15,56 +15,38 @@ interface Props {
const Status = {
Online: (
<EuiHealth color="success">
<FormattedMessage
id="xpack.ingestManager.agentHealth.onlineStatusText"
defaultMessage="Online"
/>
<FormattedMessage id="xpack.fleet.agentHealth.onlineStatusText" defaultMessage="Online" />
</EuiHealth>
),
Offline: (
<EuiHealth color="subdued">
<FormattedMessage
id="xpack.ingestManager.agentHealth.offlineStatusText"
defaultMessage="Offline"
/>
<FormattedMessage id="xpack.fleet.agentHealth.offlineStatusText" defaultMessage="Offline" />
</EuiHealth>
),
Inactive: (
<EuiHealth color="subdued">
<FormattedMessage
id="xpack.ingestManager.agentHealth.inactiveStatusText"
defaultMessage="Inactive"
/>
<FormattedMessage id="xpack.fleet.agentHealth.inactiveStatusText" defaultMessage="Inactive" />
</EuiHealth>
),
Warning: (
<EuiHealth color="warning">
<FormattedMessage
id="xpack.ingestManager.agentHealth.warningStatusText"
defaultMessage="Error"
/>
<FormattedMessage id="xpack.fleet.agentHealth.warningStatusText" defaultMessage="Error" />
</EuiHealth>
),
Error: (
<EuiHealth color="danger">
<FormattedMessage
id="xpack.ingestManager.agentHealth.errorStatusText"
defaultMessage="Error"
/>
<FormattedMessage id="xpack.fleet.agentHealth.errorStatusText" defaultMessage="Error" />
</EuiHealth>
),
Degraded: (
<EuiHealth color="danger">
<FormattedMessage
id="xpack.ingestManager.agentHealth.degradedStatusText"
defaultMessage="Degraded"
/>
<FormattedMessage id="xpack.fleet.agentHealth.degradedStatusText" defaultMessage="Degraded" />
</EuiHealth>
),
Enrolling: (
<EuiHealth color="warning">
<FormattedMessage
id="xpack.ingestManager.agentHealth.enrollingStatusText"
id="xpack.fleet.agentHealth.enrollingStatusText"
defaultMessage="Enrolling"
/>
</EuiHealth>
@ -72,17 +54,14 @@ const Status = {
Unenrolling: (
<EuiHealth color="warning">
<FormattedMessage
id="xpack.ingestManager.agentHealth.unenrollingStatusText"
id="xpack.fleet.agentHealth.unenrollingStatusText"
defaultMessage="Unenrolling"
/>
</EuiHealth>
),
Upgrading: (
<EuiHealth color="warning">
<FormattedMessage
id="xpack.ingestManager.agentHealth.updatingStatusText"
defaultMessage="Updating"
/>
<FormattedMessage id="xpack.fleet.agentHealth.updatingStatusText" defaultMessage="Updating" />
</EuiHealth>
),
};
@ -121,7 +100,7 @@ export const AgentHealth: React.FunctionComponent<Props> = ({ agent }) => {
msLastCheckIn ? (
<>
<FormattedMessage
id="xpack.ingestManager.agentHealth.checkInTooltipText"
id="xpack.fleet.agentHealth.checkInTooltipText"
defaultMessage="Last checked in {lastCheckIn}"
values={{
lastCheckIn: <FormattedRelative value={msLastCheckIn} />,
@ -133,7 +112,7 @@ export const AgentHealth: React.FunctionComponent<Props> = ({ agent }) => {
</>
) : (
<FormattedMessage
id="xpack.ingestManager.agentHealth.noCheckInTooltipText"
id="xpack.fleet.agentHealth.noCheckInTooltipText"
defaultMessage="Never checked in"
/>
)

2
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_policy_package_badges.tsx
View file

@ -25,7 +25,7 @@ export const AgentPolicyPackageBadges: React.FunctionComponent<Props> = ({ agent
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.agentReassignPolicy.policyDescription"
id="xpack.fleet.agentReassignPolicy.policyDescription"
defaultMessage="The selected agent policy will collect data for {count, plural, one {{countValue} integration} other {{countValue} integrations}}:"
values={{
count: agentPolicy.package_policies.length,

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_policy_flyout/index.tsx
View file

@ -76,7 +76,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
}
setIsSubmitting(false);
const successMessage = i18n.translate(
'xpack.ingestManager.agentReassignPolicy.successSingleNotificationTitle',
'xpack.fleet.agentReassignPolicy.successSingleNotificationTitle',
{
defaultMessage: 'Agent policy reassigned',
}
@ -97,7 +97,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiTitle size="m">
<h2 id="FleetAgentReassigmentFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.agentReassignPolicy.flyoutTitle"
id="xpack.fleet.agentReassignPolicy.flyoutTitle"
defaultMessage="Assign new agent policy"
/>
</h2>
@ -105,7 +105,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiSpacer size="m" />
<EuiText size="s">
<FormattedMessage
id="xpack.ingestManager.agentReassignPolicy.flyoutDescription"
id="xpack.fleet.agentReassignPolicy.flyoutDescription"
defaultMessage="Choose a new agent policy to assign the selected {count, plural, one {agent} other {agents}} to."
values={{
count: isSingleAgent ? 1 : 0,
@ -118,7 +118,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem>
<EuiFormRow
fullWidth
label={i18n.translate('xpack.ingestManager.agentReassignPolicy.selectPolicyLabel', {
label={i18n.translate('xpack.fleet.agentReassignPolicy.selectPolicyLabel', {
defaultMessage: 'Agent policy',
})}
>
@ -146,7 +146,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.agentReassignPolicy.cancelButtonLabel"
id="xpack.fleet.agentReassignPolicy.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
@ -159,7 +159,7 @@ export const AgentReassignAgentPolicyFlyout: React.FunctionComponent<Props> = ({
isLoading={isSubmitting}
>
<FormattedMessage
id="xpack.ingestManager.agentReassignPolicy.continueButtonLabel"
id="xpack.fleet.agentReassignPolicy.continueButtonLabel"
defaultMessage="Assign policy"
/>
</EuiButton>

38
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_unenroll_modal/index.tsx
View file

@ -45,21 +45,19 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
setIsSubmitting(false);
if (forceUnenroll) {
const successMessage = isSingleAgent
? i18n.translate(
'xpack.ingestManager.unenrollAgents.successForceSingleNotificationTitle',
{ defaultMessage: 'Agent unenrolled' }
)
: i18n.translate(
'xpack.ingestManager.unenrollAgents.successForceMultiNotificationTitle',
{ defaultMessage: 'Agents unenrolled' }
);
? i18n.translate('xpack.fleet.unenrollAgents.successForceSingleNotificationTitle', {
defaultMessage: 'Agent unenrolled',
})
: i18n.translate('xpack.fleet.unenrollAgents.successForceMultiNotificationTitle', {
defaultMessage: 'Agents unenrolled',
});
notifications.toasts.addSuccess(successMessage);
} else {
const successMessage = isSingleAgent
? i18n.translate('xpack.ingestManager.unenrollAgents.successSingleNotificationTitle', {
? i18n.translate('xpack.fleet.unenrollAgents.successSingleNotificationTitle', {
defaultMessage: 'Unenrolling agent',
})
: i18n.translate('xpack.ingestManager.unenrollAgents.successMultiNotificationTitle', {
: i18n.translate('xpack.fleet.unenrollAgents.successMultiNotificationTitle', {
defaultMessage: 'Unenrolling agents',
});
notifications.toasts.addSuccess(successMessage);
@ -68,7 +66,7 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
} catch (error) {
setIsSubmitting(false);
notifications.toasts.addError(error, {
title: i18n.translate('xpack.ingestManager.unenrollAgents.fatalErrorNotificationTitle', {
title: i18n.translate('xpack.fleet.unenrollAgents.fatalErrorNotificationTitle', {
defaultMessage: 'Error unenrolling {count, plural, one {agent} other {agents}}',
values: { count: agentCount },
}),
@ -82,12 +80,12 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
title={
isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.deleteSingleTitle"
id="xpack.fleet.unenrollAgents.deleteSingleTitle"
defaultMessage="Unenroll agent"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.forceDeleteMultipleTitle"
id="xpack.fleet.unenrollAgents.forceDeleteMultipleTitle"
defaultMessage="Unenroll {count} agents"
values={{ count: agentCount }}
/>
@ -97,7 +95,7 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
onConfirm={onSubmit}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.cancelButtonLabel"
id="xpack.fleet.unenrollAgents.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
@ -105,12 +103,12 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
confirmButtonText={
isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmSingleButtonLabel"
id="xpack.fleet.unenrollAgents.confirmSingleButtonLabel"
defaultMessage="Unenroll agent"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.confirmMultipleButtonLabel"
id="xpack.fleet.unenrollAgents.confirmMultipleButtonLabel"
defaultMessage="Unenroll {count} agents"
values={{ count: agentCount }}
/>
@ -121,14 +119,14 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
<p>
{isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.deleteSingleDescription"
id="xpack.fleet.unenrollAgents.deleteSingleDescription"
defaultMessage='This action will remove the selected agent running on "{hostName}" from Fleet.
Any data that was already sent by the agent will not be deleted. This action cannot be undone.'
values={{ hostName: ((agents[0] as Agent).local_metadata.host as any).hostname }}
/>
) : (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.deleteMultipleDescription"
id="xpack.fleet.unenrollAgents.deleteMultipleDescription"
defaultMessage="This action will remove multiple agents from Fleet and prevent new data from being ingested.
Any data that was already sent by these agents will not be affected. This action cannot be undone."
/>
@ -138,7 +136,7 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
legend={{
children: (
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.forceUnenrollLegendText"
id="xpack.fleet.unenrollAgents.forceUnenrollLegendText"
defaultMessage="Force unenroll {count, plural, one {agent} other {agents}}"
values={{ count: agentCount }}
/>
@ -149,7 +147,7 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
id="ingestManagerForceUnenrollAgents"
label={
<FormattedMessage
id="xpack.ingestManager.unenrollAgents.forceUnenrollCheckboxLabel"
id="xpack.fleet.unenrollAgents.forceUnenrollCheckboxLabel"
defaultMessage="Remove {count, plural, one {agent} other {agents}} immediately.
Do not wait for agent to send any last data."
values={{ count: agentCount }}

20
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_upgrade_modal/index.tsx
View file

@ -42,10 +42,10 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
}
setIsSubmitting(false);
const successMessage = isSingleAgent
? i18n.translate('xpack.ingestManager.upgradeAgents.successSingleNotificationTitle', {
? i18n.translate('xpack.fleet.upgradeAgents.successSingleNotificationTitle', {
defaultMessage: 'Upgrading agent',
})
: i18n.translate('xpack.ingestManager.upgradeAgents.successMultiNotificationTitle', {
: i18n.translate('xpack.fleet.upgradeAgents.successMultiNotificationTitle', {
defaultMessage: 'Upgrading agents',
});
notifications.toasts.addSuccess(successMessage);
@ -53,7 +53,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
} catch (error) {
setIsSubmitting(false);
notifications.toasts.addError(error, {
title: i18n.translate('xpack.ingestManager.upgradeAgents.fatalErrorNotificationTitle', {
title: i18n.translate('xpack.fleet.upgradeAgents.fatalErrorNotificationTitle', {
defaultMessage: 'Error upgrading {count, plural, one {agent} other {agents}}',
values: { count: agentCount },
}),
@ -67,12 +67,12 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
title={
isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.deleteSingleTitle"
id="xpack.fleet.upgradeAgents.deleteSingleTitle"
defaultMessage="Upgrade agent"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.deleteMultipleTitle"
id="xpack.fleet.upgradeAgents.deleteMultipleTitle"
defaultMessage="Upgrade {count} agents"
values={{ count: agentCount }}
/>
@ -82,7 +82,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
onConfirm={onSubmit}
cancelButtonText={
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.cancelButtonLabel"
id="xpack.fleet.upgradeAgents.cancelButtonLabel"
defaultMessage="Cancel"
/>
}
@ -90,12 +90,12 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
confirmButtonText={
isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.confirmSingleButtonLabel"
id="xpack.fleet.upgradeAgents.confirmSingleButtonLabel"
defaultMessage="Upgrade agent"
/>
) : (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.confirmMultipleButtonLabel"
id="xpack.fleet.upgradeAgents.confirmMultipleButtonLabel"
defaultMessage="Upgrade {count} agents"
values={{ count: agentCount }}
/>
@ -105,7 +105,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
<p>
{isSingleAgent ? (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.upgradeSingleDescription"
id="xpack.fleet.upgradeAgents.upgradeSingleDescription"
defaultMessage='This action will upgrade the selected agent running on "{hostName}" to version {version}. This action cannot be undone. Are you sure you wish to continue?'
values={{
hostName: ((agents[0] as Agent).local_metadata.host as any).hostname,
@ -114,7 +114,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<Props> = ({
/>
) : (
<FormattedMessage
id="xpack.ingestManager.upgradeAgents.upgradeMultipleDescription"
id="xpack.fleet.upgradeAgents.upgradeMultipleDescription"
defaultMessage="This action will upgrade multiple agents to version {version}. This action cannot be undone. Are you sure you wish to continue?"
values={{ version }}
/>

23
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx
View file

@ -53,7 +53,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
titleSize="xs"
textAlign="right"
title={<EuiI18nNumber value={agentStatus?.total ?? 0} />}
description={i18n.translate('xpack.ingestManager.agentListStatus.totalLabel', {
description={i18n.translate('xpack.fleet.agentListStatus.totalLabel', {
defaultMessage: 'Agents',
})}
/>
@ -79,7 +79,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
<EuiI18nNumber value={agentStatus?.online ?? 0} />
</EuiHealth>
}
description={i18n.translate('xpack.ingestManager.agentListStatus.onlineLabel', {
description={i18n.translate('xpack.fleet.agentListStatus.onlineLabel', {
defaultMessage: 'Online',
})}
/>
@ -89,7 +89,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
textAlign="right"
titleSize="xs"
title={<EuiI18nNumber value={agentStatus?.offline ?? 0} />}
description={i18n.translate('xpack.ingestManager.agentListStatus.offlineLabel', {
description={i18n.translate('xpack.fleet.agentListStatus.offlineLabel', {
defaultMessage: 'Offline',
})}
/>
@ -99,7 +99,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
textAlign="right"
titleSize="xs"
title={<EuiI18nNumber value={agentStatus?.error ?? 0} />}
description={i18n.translate('xpack.ingestManager.agentListStatus.errorLabel', {
description={i18n.translate('xpack.fleet.agentListStatus.errorLabel', {
defaultMessage: 'Error',
})}
/>
@ -112,7 +112,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
<EuiFlexItem grow={false}>
<EuiButton fill iconType="plusInCircle" onClick={() => setIsEnrollmentFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.agentList.enrollButton"
id="xpack.fleet.agentList.enrollButton"
defaultMessage="Add agent"
/>
</EuiButton>
@ -126,7 +126,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
<EuiFlexItem>
<EuiText>
<h1>
<FormattedMessage id="xpack.ingestManager.agents.pageTitle" defaultMessage="Agents" />
<FormattedMessage id="xpack.fleet.agents.pageTitle" defaultMessage="Agents" />
</h1>
</EuiText>
</EuiFlexItem>
@ -134,7 +134,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.agents.pageSubtitle"
id="xpack.fleet.agents.pageSubtitle"
defaultMessage="Manage and deploy policy updates to a group of agents of any size."
/>
</p>
@ -159,19 +159,14 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
tabs={
([
{
name: (
<FormattedMessage
id="xpack.ingestManager.listTabs.agentTitle"
defaultMessage="Agents"
/>
),
name: <FormattedMessage id="xpack.fleet.listTabs.agentTitle" defaultMessage="Agents" />,
isSelected: routeMatch.path === PAGE_ROUTING_PATHS.fleet_agent_list,
href: getHref('fleet_agent_list'),
},
{
name: (
<FormattedMessage
id="xpack.ingestManager.listTabs.enrollmentTokensTitle"
id="xpack.fleet.listTabs.enrollmentTokensTitle"
defaultMessage="Enrollment tokens"
/>
),

22
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/confirm_delete_modal.tsx
View file

@ -20,28 +20,22 @@ export const ConfirmEnrollmentTokenDelete = (props: Props) => {
return (
<EuiOverlayMask>
<EuiConfirmModal
title={i18n.translate('xpack.ingestManager.enrollmentTokenDeleteModal.title', {
title={i18n.translate('xpack.fleet.enrollmentTokenDeleteModal.title', {
defaultMessage: 'Revoke enrollment token',
})}
onCancel={onCancel}
onConfirm={onConfirm}
cancelButtonText={i18n.translate(
'xpack.ingestManager.enrollmentTokenDeleteModal.cancelButton',
{
defaultMessage: 'Cancel',
}
)}
confirmButtonText={i18n.translate(
'xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton',
{
defaultMessage: 'Revoke enrollment token',
}
)}
cancelButtonText={i18n.translate('xpack.fleet.enrollmentTokenDeleteModal.cancelButton', {
defaultMessage: 'Cancel',
})}
confirmButtonText={i18n.translate('xpack.fleet.enrollmentTokenDeleteModal.deleteButton', {
defaultMessage: 'Revoke enrollment token',
})}
defaultFocusedButton="confirm"
buttonColor="danger"
>
<EuiCallOut
title={i18n.translate('xpack.ingestManager.enrollmentTokenDeleteModal.description', {
title={i18n.translate('xpack.fleet.enrollmentTokenDeleteModal.description', {
defaultMessage:
'Are your sure you want to revoke {keyName}? Agents that use this token will no longer be able to access policies or send data. ',
values: {

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
View file

@ -51,7 +51,7 @@ function useCreateApiKeyForm(
setIsLoading(false);
onSuccess(res.data.item.id);
notifications.toasts.addSuccess(
i18n.translate('xpack.ingestManager.newEnrollmentKey.keyCreatedToasts', {
i18n.translate('xpack.fleet.newEnrollmentKey.keyCreatedToasts', {
defaultMessage: 'Enrollment token created.',
})
);
@ -89,7 +89,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
<EuiForm>
<form onSubmit={form.onSubmit}>
<EuiFormRow
label={i18n.translate('xpack.ingestManager.newEnrollmentKey.nameLabel', {
label={i18n.translate('xpack.fleet.newEnrollmentKey.nameLabel', {
defaultMessage: 'Name',
})}
>
@ -102,7 +102,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
</EuiFormRow>
<EuiFormRow
label={i18n.translate('xpack.ingestManager.newEnrollmentKey.policyLabel', {
label={i18n.translate('xpack.fleet.newEnrollmentKey.policyLabel', {
defaultMessage: 'Policy',
})}
>
@ -118,7 +118,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
</EuiFormRow>
<EuiButton type="submit" fill isLoading={form.isLoading}>
<FormattedMessage
id="xpack.ingestManager.newEnrollmentKey.submitButton"
id="xpack.fleet.newEnrollmentKey.submitButton"
defaultMessage="Create enrollment token"
/>
</EuiButton>
@ -132,7 +132,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
<EuiTitle size="m">
<h2 id="FleetNewEnrollmentKeyFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.newEnrollmentKey.flyoutTitle"
id="xpack.fleet.newEnrollmentKey.flyoutTitle"
defaultMessage="Create enrollment token"
/>
</h2>
@ -144,7 +144,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.newEnrollmentKey.cancelButtonLabel"
id="xpack.fleet.newEnrollmentKey.cancelButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>

39
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
View file

@ -73,10 +73,10 @@ const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }
<EuiToolTip
content={
state === 'VISIBLE'
? i18n.translate('xpack.ingestManager.enrollmentTokensList.hideTokenButtonLabel', {
? i18n.translate('xpack.fleet.enrollmentTokensList.hideTokenButtonLabel', {
defaultMessage: 'Hide token',
})
: i18n.translate('xpack.ingestManager.enrollmentTokensList.showTokenButtonLabel', {
: i18n.translate('xpack.fleet.enrollmentTokensList.showTokenButtonLabel', {
defaultMessage: 'Show token',
})
}
@ -84,10 +84,10 @@ const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }
<EuiButtonIcon
aria-label={
state === 'VISIBLE'
? i18n.translate('xpack.ingestManager.enrollmentTokensList.hideTokenButtonLabel', {
? i18n.translate('xpack.fleet.enrollmentTokensList.hideTokenButtonLabel', {
defaultMessage: 'Hide token',
})
: i18n.translate('xpack.ingestManager.enrollmentTokensList.showTokenButtonLabel', {
: i18n.translate('xpack.fleet.enrollmentTokensList.showTokenButtonLabel', {
defaultMessage: 'Show token',
})
}
@ -134,17 +134,14 @@ const DeleteButton: React.FunctionComponent<{ apiKey: EnrollmentAPIKey; refresh:
/>
)}
<EuiToolTip
content={i18n.translate('xpack.ingestManager.enrollmentTokensList.revokeTokenButtonLabel', {
content={i18n.translate('xpack.fleet.enrollmentTokensList.revokeTokenButtonLabel', {
defaultMessage: 'Revoke token',
})}
>
<EuiButtonIcon
aria-label={i18n.translate(
'xpack.ingestManager.enrollmentTokensList.revokeTokenButtonLabel',
{
defaultMessage: 'Revoke token',
}
)}
aria-label={i18n.translate('xpack.fleet.enrollmentTokensList.revokeTokenButtonLabel', {
defaultMessage: 'Revoke token',
})}
onClick={() => setState('CONFIRM_VISIBLE')}
iconType="trash"
color="danger"
@ -178,7 +175,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
const columns = [
{
field: 'name',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.nameTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.nameTitle', {
defaultMessage: 'Name',
}),
render: (value: string) => (
@ -189,7 +186,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'id',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.secretTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.secretTitle', {
defaultMessage: 'Secret',
}),
width: '215px',
@ -199,7 +196,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'policy_id',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.policyTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.policyTitle', {
defaultMessage: 'Agent policy',
}),
render: (policyId: string) => {
@ -214,7 +211,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'created_at',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.createdAtTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.createdAtTitle', {
defaultMessage: 'Created on',
}),
width: '150px',
@ -226,7 +223,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'active',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.activeTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.activeTitle', {
defaultMessage: 'Active',
}),
width: '70px',
@ -237,7 +234,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
},
{
field: 'actions',
name: i18n.translate('xpack.ingestManager.enrollmentTokensList.actionsTitle', {
name: i18n.translate('xpack.fleet.enrollmentTokensList.actionsTitle', {
defaultMessage: 'Actions',
}),
width: '70px',
@ -267,7 +264,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
)}
<EuiText color="subdued">
<FormattedMessage
id="xpack.ingestManager.enrollmentTokensList.pageDescription"
id="xpack.fleet.enrollmentTokensList.pageDescription"
defaultMessage="Create and revoke enrollment tokens. An enrollment token enables one or more agents to enroll in Fleet and send data."
/>
</EuiText>
@ -289,7 +286,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
<EuiFlexItem grow={false}>
<EuiButton iconType="plusInCircle" onClick={() => setFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.enrollmentTokensList.newKeyButton"
id="xpack.fleet.enrollmentTokensList.newKeyButton"
defaultMessage="Create enrollment token"
/>
</EuiButton>
@ -302,12 +299,12 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
noItemsMessage={
enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest ? (
<FormattedMessage
id="xpack.ingestManager.enrollemntAPIKeyList.loadingTokensMessage"
id="xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage"
defaultMessage="Loading enrollment tokens..."
/>
) : (
<FormattedMessage
id="xpack.ingestManager.enrollemntAPIKeyList.emptyMessage"
id="xpack.fleet.enrollemntAPIKeyList.emptyMessage"
defaultMessage="No enrollment tokens found."
/>
)

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/error_pages/enforce_security.tsx
View file

@ -11,14 +11,14 @@ import { NoDataLayout } from './components/no_data_layout';
export const EnforceSecurityPage = injectI18n(({ intl }) => (
<NoDataLayout
title={intl.formatMessage({
id: 'xpack.ingestManager.disabledSecurityTitle',
id: 'xpack.fleet.disabledSecurityTitle',
defaultMessage: 'Security is not enabled',
})}
actionSection={[]}
>
<p>
<FormattedMessage
id="xpack.ingestManager.disabledSecurityDescription"
id="xpack.fleet.disabledSecurityDescription"
defaultMessage="You must enable security in Kibana and Elasticsearch to use Elastic Fleet."
/>
</p>

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/error_pages/invalid_license.tsx
View file

@ -11,14 +11,14 @@ import { NoDataLayout } from './components/no_data_layout';
export const InvalidLicensePage = injectI18n(({ intl }) => (
<NoDataLayout
title={intl.formatMessage({
id: 'xpack.ingestManager.invalidLicenseTitle',
id: 'xpack.fleet.invalidLicenseTitle',
defaultMessage: 'Expired license',
})}
actionSection={[]}
>
<p>
<FormattedMessage
id="xpack.ingestManager.invalidLicenseDescription"
id="xpack.fleet.invalidLicenseDescription"
defaultMessage="Your current license is expired. Enrolled Beats Agents will continue to work, but you need a valid
license to access the Elastic Fleet interface."
/>

4
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/error_pages/no_access.tsx
View file

@ -11,14 +11,14 @@ import { NoDataLayout } from './components/no_data_layout';
export const NoAccessPage = injectI18n(({ intl }) => (
<NoDataLayout
title={intl.formatMessage({
id: 'xpack.ingestManager.noAccess.accessDeniedTitle',
id: 'xpack.fleet.noAccess.accessDeniedTitle',
defaultMessage: 'Access denied',
})}
actionSection={[]}
>
<p>
<FormattedMessage
id="xpack.ingestManager.noAccess.accessDeniedDescription"
id="xpack.fleet.noAccess.accessDeniedDescription"
defaultMessage="You are not authorized to access Elastic Fleet. To use Elastic Fleet,
you need a user role that contains read or all permissions for this application."
/>

39
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
View file

@ -86,7 +86,7 @@ export const SetupPage: React.FunctionComponent<{
<EuiTitle size="l">
<h2>
<FormattedMessage
id="xpack.ingestManager.setupPage.enableTitle"
id="xpack.fleet.setupPage.enableTitle"
defaultMessage="Enable central management for Elastic Agents"
/>
</h2>
@ -94,7 +94,7 @@ export const SetupPage: React.FunctionComponent<{
<EuiSpacer size="xl" />
<EuiText color="subdued">
<FormattedMessage
id="xpack.ingestManager.setupPage.enableText"
id="xpack.fleet.setupPage.enableText"
defaultMessage="Central management requires an Elastic user who can create API keys and write to logs-* and metrics-*."
/>
</EuiText>
@ -102,7 +102,7 @@ export const SetupPage: React.FunctionComponent<{
<EuiForm>
<EuiButton onClick={onSubmit} fill isLoading={isFormLoading} type="submit">
<FormattedMessage
id="xpack.ingestManager.setupPage.enableCentralManagement"
id="xpack.fleet.setupPage.enableCentralManagement"
defaultMessage="Create user and enable central management"
/>
</EuiButton>
@ -119,26 +119,26 @@ export const SetupPage: React.FunctionComponent<{
<EuiPageBody restrictWidth={820}>
<EuiPageContent>
<EuiCallOut
title={i18n.translate('xpack.ingestManager.setupPage.missingRequirementsCalloutTitle', {
title={i18n.translate('xpack.fleet.setupPage.missingRequirementsCalloutTitle', {
defaultMessage: 'Missing security requirements',
})}
color="warning"
iconType="alert"
>
<FormattedMessage
id="xpack.ingestManager.setupPage.missingRequirementsCalloutDescription"
id="xpack.fleet.setupPage.missingRequirementsCalloutDescription"
defaultMessage="To use central management for Elastic Agents, enable the following Elasticsearch and Kibana security features."
/>
</EuiCallOut>
<EuiSpacer size="m" />
<FormattedMessage
id="xpack.ingestManager.setupPage.missingRequirementsElasticsearchTitle"
id="xpack.fleet.setupPage.missingRequirementsElasticsearchTitle"
defaultMessage="In your Elasticsearch policy, enable:"
/>
<EuiSpacer size="l" />
<RequirementItem isMissing={false}>
<FormattedMessage
id="xpack.ingestManager.setupPage.elasticsearchSecurityFlagText"
id="xpack.fleet.setupPage.elasticsearchSecurityFlagText"
defaultMessage="{esSecurityLink}. Set {securityFlag} to {true} ."
values={{
esSecurityLink: (
@ -148,7 +148,7 @@ export const SetupPage: React.FunctionComponent<{
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.elasticsearchSecurityLink"
id="xpack.fleet.setupPage.elasticsearchSecurityLink"
defaultMessage="Elasticsearch security"
/>
</EuiLink>
@ -161,7 +161,7 @@ export const SetupPage: React.FunctionComponent<{
<EuiSpacer size="s" />
<RequirementItem isMissing={missingRequirements.includes('api_keys')}>
<FormattedMessage
id="xpack.ingestManager.setupPage.elasticsearchApiKeyFlagText"
id="xpack.fleet.setupPage.elasticsearchApiKeyFlagText"
defaultMessage="{apiKeyLink}. Set {apiKeyFlag} to {true} ."
values={{
apiKeyFlag: <EuiCode>xpack.security.authc.api_key.enabled</EuiCode>,
@ -173,7 +173,7 @@ export const SetupPage: React.FunctionComponent<{
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.apiKeyServiceLink"
id="xpack.fleet.setupPage.apiKeyServiceLink"
defaultMessage="API key service"
/>
</EuiLink>
@ -188,13 +188,13 @@ xpack.security.authc.api_key.enabled: true`}
</EuiCodeBlock>
<EuiSpacer size="l" />
<FormattedMessage
id="xpack.ingestManager.setupPage.missingRequirementsKibanaTitle"
id="xpack.fleet.setupPage.missingRequirementsKibanaTitle"
defaultMessage="In your Kibana policy, enable:"
/>
<EuiSpacer size="l" />
<RequirementItem isMissing={missingRequirements.includes('tls_required')}>
<FormattedMessage
id="xpack.ingestManager.setupPage.tlsFlagText"
id="xpack.fleet.setupPage.tlsFlagText"
defaultMessage="{kibanaSecurityLink}. Set {securityFlag} to {true}. For development purposes, you can disable {tlsLink} by setting {tlsFlag} to {true} as an unsafe alternative."
values={{
kibanaSecurityLink: (
@ -204,7 +204,7 @@ xpack.security.authc.api_key.enabled: true`}
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.kibanaSecurityLink"
id="xpack.fleet.setupPage.kibanaSecurityLink"
defaultMessage="Kibana security"
/>
</EuiLink>
@ -216,10 +216,7 @@ xpack.security.authc.api_key.enabled: true`}
target="_blank"
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.tlsLink"
defaultMessage="TLS"
/>
<FormattedMessage id="xpack.fleet.setupPage.tlsLink" defaultMessage="TLS" />
</EuiLink>
),
tlsFlag: <EuiCode>xpack.fleet.agents.tlsCheckDisabled</EuiCode>,
@ -234,7 +231,7 @@ xpack.security.authc.api_key.enabled: true`}
)}
>
<FormattedMessage
id="xpack.ingestManager.setupPage.encryptionKeyFlagText"
id="xpack.fleet.setupPage.encryptionKeyFlagText"
defaultMessage="{encryptionKeyLink}. Set {keyFlag} to any alphanumeric value of at least 32 characters."
values={{
encryptionKeyLink: (
@ -244,7 +241,7 @@ xpack.security.authc.api_key.enabled: true`}
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.kibanaEncryptionLink"
id="xpack.fleet.setupPage.kibanaEncryptionLink"
defaultMessage="Kibana encryption key"
/>
</EuiLink>
@ -260,7 +257,7 @@ xpack.encryptedSavedObjects.encryptionKey: "something_at_least_32_characters"`}
</EuiCodeBlock>
<EuiSpacer size="l" />
<FormattedMessage
id="xpack.ingestManager.setupPage.gettingStartedText"
id="xpack.fleet.setupPage.gettingStartedText"
defaultMessage="For more information, read our {link} guide."
values={{
link: (
@ -270,7 +267,7 @@ xpack.encryptedSavedObjects.encryptionKey: "something_at_least_32_characters"`}
external
>
<FormattedMessage
id="xpack.ingestManager.setupPage.gettingStartedLink"
id="xpack.fleet.setupPage.gettingStartedLink"
defaultMessage="Getting Started"
/>
</EuiLink>

10
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
View file

@ -32,14 +32,14 @@ export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> =
return (
<EuiFlexItem component="section">
<OverviewPanel
title={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTitle', {
title={i18n.translate('xpack.fleet.overviewPagePoliciesPanelTitle', {
defaultMessage: 'Agent policies',
})}
tooltip={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelTooltip', {
tooltip={i18n.translate('xpack.fleet.overviewPagePoliciesPanelTooltip', {
defaultMessage: 'Use agent policies to control the data that your agents collect.',
})}
linkTo={getHref('policies_list')}
linkToText={i18n.translate('xpack.ingestManager.overviewPagePoliciesPanelAction', {
linkToText={i18n.translate('xpack.fleet.overviewPagePoliciesPanelAction', {
defaultMessage: 'View policies',
})}
>
@ -50,7 +50,7 @@ export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> =
<>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewPolicyTotalTitle"
id="xpack.fleet.overviewPolicyTotalTitle"
defaultMessage="Total available"
/>
</EuiDescriptionListTitle>
@ -59,7 +59,7 @@ export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> =
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewPackagePolicyTitle"
id="xpack.fleet.overviewPackagePolicyTitle"
defaultMessage="Used integrations"
/>
</EuiDescriptionListTitle>

17
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/agent_section.tsx
View file

@ -25,15 +25,15 @@ export const OverviewAgentSection = () => {
return (
<EuiFlexItem component="section">
<OverviewPanel
title={i18n.translate('xpack.ingestManager.overviewPageAgentsPanelTitle', {
title={i18n.translate('xpack.fleet.overviewPageAgentsPanelTitle', {
defaultMessage: 'Agents',
})}
tooltip={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTooltip', {
tooltip={i18n.translate('xpack.fleet.overviewPageFleetPanelTooltip', {
defaultMessage:
'Use Fleet to enroll agents and manage their policies from a central location.',
})}
linkTo={getHref('fleet_agent_list')}
linkToText={i18n.translate('xpack.ingestManager.overviewPageFleetPanelAction', {
linkToText={i18n.translate('xpack.fleet.overviewPageFleetPanelAction', {
defaultMessage: 'View agents',
})}
>
@ -44,7 +44,7 @@ export const OverviewAgentSection = () => {
<>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewAgentTotalTitle"
id="xpack.fleet.overviewAgentTotalTitle"
defaultMessage="Total agents"
/>
</EuiDescriptionListTitle>
@ -53,7 +53,7 @@ export const OverviewAgentSection = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewAgentActiveTitle"
id="xpack.fleet.overviewAgentActiveTitle"
defaultMessage="Active"
/>
</EuiDescriptionListTitle>
@ -62,7 +62,7 @@ export const OverviewAgentSection = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewAgentOfflineTitle"
id="xpack.fleet.overviewAgentOfflineTitle"
defaultMessage="Offline"
/>
</EuiDescriptionListTitle>
@ -70,10 +70,7 @@ export const OverviewAgentSection = () => {
<EuiI18nNumber value={agentStatusRequest.data?.results?.offline ?? 0} />
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewAgentErrorTitle"
defaultMessage="Error"
/>
<FormattedMessage id="xpack.fleet.overviewAgentErrorTitle" defaultMessage="Error" />
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
<EuiI18nNumber value={agentStatusRequest.data?.results?.error ?? 0} />

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/datastream_section.tsx
View file

@ -46,14 +46,14 @@ export const OverviewDatastreamSection: React.FC = () => {
return (
<EuiFlexItem component="section">
<OverviewPanel
title={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelTitle', {
title={i18n.translate('xpack.fleet.overviewPageDataStreamsPanelTitle', {
defaultMessage: 'Data streams',
})}
tooltip={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelTooltip', {
tooltip={i18n.translate('xpack.fleet.overviewPageDataStreamsPanelTooltip', {
defaultMessage: 'Data that your agents collect are organized into various data streams.',
})}
linkTo={getHref('data_streams')}
linkToText={i18n.translate('xpack.ingestManager.overviewPageDataStreamsPanelAction', {
linkToText={i18n.translate('xpack.fleet.overviewPageDataStreamsPanelAction', {
defaultMessage: 'View data streams',
})}
>
@ -64,7 +64,7 @@ export const OverviewDatastreamSection: React.FC = () => {
<>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewDatastreamTotalTitle"
id="xpack.fleet.overviewDatastreamTotalTitle"
defaultMessage="Data streams"
/>
</EuiDescriptionListTitle>
@ -73,7 +73,7 @@ export const OverviewDatastreamSection: React.FC = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewDatastreamNamespacesTitle"
id="xpack.fleet.overviewDatastreamNamespacesTitle"
defaultMessage="Namespaces"
/>
</EuiDescriptionListTitle>
@ -82,7 +82,7 @@ export const OverviewDatastreamSection: React.FC = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewDatastreamSizeTitle"
id="xpack.fleet.overviewDatastreamSizeTitle"
defaultMessage="Total size"
/>
</EuiDescriptionListTitle>

12
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/integration_section.tsx
View file

@ -32,15 +32,15 @@ export const OverviewIntegrationSection: React.FC = () => {
return (
<EuiFlexItem component="section">
<OverviewPanel
title={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelTitle', {
title={i18n.translate('xpack.fleet.overviewPageIntegrationsPanelTitle', {
defaultMessage: 'Integrations',
})}
tooltip={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelTooltip', {
tooltip={i18n.translate('xpack.fleet.overviewPageIntegrationsPanelTooltip', {
defaultMessage:
'Browse and install integrations for the Elastic Stack. Add integrations to your agent policies to start sending data.',
})}
linkTo={getHref('integrations_all')}
linkToText={i18n.translate('xpack.ingestManager.overviewPageIntegrationsPanelAction', {
linkToText={i18n.translate('xpack.fleet.overviewPageIntegrationsPanelAction', {
defaultMessage: 'View integrations',
})}
>
@ -51,7 +51,7 @@ export const OverviewIntegrationSection: React.FC = () => {
<>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewIntegrationsTotalTitle"
id="xpack.fleet.overviewIntegrationsTotalTitle"
defaultMessage="Total available"
/>
</EuiDescriptionListTitle>
@ -60,7 +60,7 @@ export const OverviewIntegrationSection: React.FC = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewIntegrationsInstalledTitle"
id="xpack.fleet.overviewIntegrationsInstalledTitle"
defaultMessage="Installed"
/>
</EuiDescriptionListTitle>
@ -69,7 +69,7 @@ export const OverviewIntegrationSection: React.FC = () => {
</EuiDescriptionListDescription>
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.overviewIntegrationsUpdatesAvailableTitle"
id="xpack.fleet.overviewIntegrationsUpdatesAvailableTitle"
defaultMessage="Updates available"
/>
</EuiDescriptionListTitle>

13
x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/index.tsx
View file

@ -45,20 +45,17 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
<EuiTitle size="l">
<h1>
<FormattedMessage
id="xpack.ingestManager.overviewPageTitle"
defaultMessage="Fleet"
/>
<FormattedMessage id="xpack.fleet.overviewPageTitle" defaultMessage="Fleet" />
</h1>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiBetaBadge
label={i18n.translate('xpack.ingestManager.betaBadge.labelText', {
label={i18n.translate('xpack.fleet.betaBadge.labelText', {
defaultMessage: 'Beta',
})}
tooltipContent={i18n.translate('xpack.ingestManager.betaBadge.tooltipText', {
tooltipContent={i18n.translate('xpack.fleet.betaBadge.tooltipText', {
defaultMessage:
'This plugin is not recommended for production environments. Please report bugs in our Discuss forum.',
})}
@ -70,7 +67,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.overviewPageSubtitle"
id="xpack.fleet.overviewPageSubtitle"
defaultMessage="Manage Elastic Agents and their policies in a central location."
/>
</p>
@ -83,7 +80,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
<EuiFlexItem grow={false}>
<EuiButton fill iconType="plusInCircle" onClick={() => setIsEnrollmentFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.overviewPageEnrollAgentButton"
id="xpack.fleet.overviewPageEnrollAgentButton"
defaultMessage="Add agent"
/>
</EuiButton>

6
x-pack/plugins/ingest_manager/public/plugin.ts
View file

@ -82,7 +82,7 @@ export class IngestManagerPlugin
core.application.register({
id: PLUGIN_ID,
category: DEFAULT_APP_CATEGORIES.management,
title: i18n.translate('xpack.ingestManager.appTitle', { defaultMessage: 'Fleet' }),
title: i18n.translate('xpack.fleet.appTitle', { defaultMessage: 'Fleet' }),
order: 9020,
euiIconType: 'logoElastic',
async mount(params: AppMountParameters) {
@ -109,10 +109,10 @@ export class IngestManagerPlugin
deps.home.featureCatalogue.register({
id: 'ingestManager',
title: i18n.translate('xpack.ingestManager.featureCatalogueTitle', {
title: i18n.translate('xpack.fleet.featureCatalogueTitle', {
defaultMessage: 'Add Elastic Agent',
}),
description: i18n.translate('xpack.ingestManager.featureCatalogueDescription', {
description: i18n.translate('xpack.fleet.featureCatalogueDescription', {
defaultMessage: 'Add and manage your fleet of Elastic Agents and integrations.',
}),
icon: 'indexManagementApp',

1144
x-pack/plugins/translations/translations/ja-JP.json
View file

File diff suppressed because it is too large Load diff

1148
x-pack/plugins/translations/translations/zh-CN.json
View file

File diff suppressed because it is too large Load diff