Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[Fleet] Rename Ingest Manager => Fleet, Fleet => Agents in the UI #78685

Merged
merged 2 commits into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useCore } from './use_core';
const BASE_BREADCRUMB: ChromeBreadcrumb = {
href: pagePathGetters.overview(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.appTitle', {
defaultMessage: 'Ingest Manager',
defaultMessage: 'Fleet',
}),
};

Expand Down Expand Up @@ -155,21 +155,15 @@ const breadcrumbGetters: {
fleet: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
defaultMessage: 'Fleet',
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
],
fleet_agent_list: () => [
BASE_BREADCRUMB,
{
href: pagePathGetters.fleet(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
defaultMessage: 'Fleet',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle', {
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
Expand All @@ -178,12 +172,7 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.fleet(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
defaultMessage: 'Fleet',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle', {
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
Expand All @@ -193,12 +182,12 @@ const breadcrumbGetters: {
BASE_BREADCRUMB,
{
href: pagePathGetters.fleet(),
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
defaultMessage: 'Fleet',
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
defaultMessage: 'Agents',
}),
},
{
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle', {
text: i18n.translate('xpack.ingestManager.breadcrumbs.enrollmentTokensPageTitle', {
defaultMessage: 'Enrollment tokens',
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
disabled={!fleet?.enabled}
>
<FormattedMessage
id="xpack.ingestManager.appNavigation.fleetLinkText"
defaultMessage="Fleet"
id="xpack.ingestManager.appNavigation.agentsLinkText"
defaultMessage="Agents"
/>
</EuiTab>
<EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
) : (
<>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
id="xpack.ingestManager.agentEnrollment.agentsNotInitializedText"
defaultMessage="Before enrolling agents, {link}."
values={{
link: (
<EuiLink href={getHref('fleet')}>
<FormattedMessage
id="xpack.ingestManager.agentEnrollment.setUpFleetLink"
defaultMessage="set up Fleet"
id="xpack.ingestManager.agentEnrollment.setUpAgentsLink"
defaultMessage="set up Agents"
Copy link
Contributor

Choose a reason for hiding this comment

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

Before enrolling agents, set up Agents. sounds weird. maybe Before enrolling agents, enable agent management. or similar would be better? we can revisit this in the follow up PR for Fleet setup page, the words here should be consistent with whatever we use for the setup page

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 I will revisit it when I do the requirements page @hbharding or @dedemorton if you have suggestions here on better wording

/>
</EuiLink>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
<EuiFlexItem>
<EuiText>
<h1>
<FormattedMessage id="xpack.ingestManager.fleet.pageTitle" defaultMessage="Fleet" />
<FormattedMessage id="xpack.ingestManager.agents.pageTitle" defaultMessage="Agents" />
</h1>
</EuiText>
</EuiFlexItem>
<EuiFlexItem>
<EuiText color="subdued">
<p>
<FormattedMessage
id="xpack.ingestManager.fleet.pageSubtitle"
id="xpack.ingestManager.agents.pageSubtitle"
defaultMessage="Manage and deploy policy updates to a group of agents of any size."
/>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export const OverviewAgentSection = () => {
return (
<EuiFlexItem component="section">
<OverviewPanel
title={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTitle', {
defaultMessage: 'Fleet',
title={i18n.translate('xpack.ingestManager.overviewPageAgentsPanelTitle', {
defaultMessage: 'Agents',
})}
tooltip={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTooltip', {
defaultMessage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
<h1>
<FormattedMessage
id="xpack.ingestManager.overviewPageTitle"
defaultMessage="Ingest Manager"
defaultMessage="Fleet"
/>
</h1>
</EuiTitle>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ingest_manager/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class IngestManagerPlugin
core.application.register({
id: PLUGIN_ID,
category: DEFAULT_APP_CATEGORIES.management,
title: i18n.translate('xpack.ingestManager.appTitle', { defaultMessage: 'Ingest Manager' }),
title: i18n.translate('xpack.ingestManager.appTitle', { defaultMessage: 'Fleet' }),
order: 9020,
euiIconType: 'logoElastic',
async mount(params: AppMountParameters) {
Expand Down
8 changes: 0 additions & 8 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -8986,7 +8986,6 @@
"xpack.ingestManager.agentEnrollment.downloadLink": "elastic.co/downloadsに移動",
"xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "フリートに登録",
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "スタンドアロンモード",
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "エージェントを登録する前に、フリートを設定する必要があります。{link}",
"xpack.ingestManager.agentEnrollment.flyoutTitle": "エージェントの追加",
"xpack.ingestManager.agentEnrollment.managedDescription": "必要なエージェントの数に関係なく、Fleetでは、簡単に一元的に更新を管理し、エージェントにデプロイすることができます。次の手順に従い、Elasticエージェントをダウンロードし、Fleetに登録してください。",
"xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
Expand Down Expand Up @@ -9068,7 +9067,6 @@
"xpack.ingestManager.alphaMessging.closeFlyoutLabel": "閉じる",
"xpack.ingestManager.appNavigation.dataStreamsLinkText": "データセット",
"xpack.ingestManager.appNavigation.epmLinkText": "統合",
"xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
"xpack.ingestManager.appNavigation.overviewLinkText": "概要",
"xpack.ingestManager.appNavigation.sendFeedbackButton": "フィードバックを送信",
"xpack.ingestManager.appNavigation.settingsButton": "設定",
Expand All @@ -9078,9 +9076,6 @@
"xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "すべて",
"xpack.ingestManager.breadcrumbs.appTitle": "Ingest Manager",
"xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "データセット",
"xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "エージェント",
"xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "登録トークン",
"xpack.ingestManager.breadcrumbs.fleetPageTitle": "フリート",
"xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
"xpack.ingestManager.breadcrumbs.integrationsPageTitle": "統合",
"xpack.ingestManager.breadcrumbs.overviewPageTitle": "概要",
Expand Down Expand Up @@ -9149,8 +9144,6 @@
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "パッケージが見つかりません",
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "統合を検索",
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "更新が可能です",
"xpack.ingestManager.fleet.pageSubtitle": "構成の更新を管理し、任意のサイズのエージェントのグループにデプロイします。",
"xpack.ingestManager.fleet.pageTitle": "フリート",
"xpack.ingestManager.genericActionsMenuText": "開く",
"xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText": "メッセージを消去",
"xpack.ingestManager.homeIntegration.tutorialDirectory.ingestManagerAppButtonText": "Ingest Managerベータを試す",
Expand Down Expand Up @@ -9229,7 +9222,6 @@
"xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "エージェントが収集するデータはさまざまなデータセットに整理されます。",
"xpack.ingestManager.overviewPageEnrollAgentButton": "エージェントの追加",
"xpack.ingestManager.overviewPageFleetPanelAction": "エージェントを表示",
"xpack.ingestManager.overviewPageFleetPanelTitle": "フリート",
"xpack.ingestManager.overviewPageFleetPanelTooltip": "Fleetを使用して、中央の場所からエージェントを登録し、構成を管理します。",
"xpack.ingestManager.overviewPageIntegrationsPanelAction": "統合を表示",
"xpack.ingestManager.overviewPageIntegrationsPanelTitle": "統合",
Expand Down
8 changes: 0 additions & 8 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -8992,7 +8992,6 @@
"xpack.ingestManager.agentEnrollment.downloadLink": "前往 elastic.co/downloads",
"xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "注册到 Fleet",
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "独立模式",
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "注册代理前需要设置 Fleet。{link}",
"xpack.ingestManager.agentEnrollment.flyoutTitle": "添加代理",
"xpack.ingestManager.agentEnrollment.managedDescription": "无论是需要一个代理还是需要数以千计的代理,Fleet 允许您轻松地集中管理并部署代理的更新。按照下面的说明下载 Elastic 代理并将代理注册到 Fleet。",
"xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改,则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
Expand Down Expand Up @@ -9074,7 +9073,6 @@
"xpack.ingestManager.alphaMessging.closeFlyoutLabel": "关闭",
"xpack.ingestManager.appNavigation.dataStreamsLinkText": "数据集",
"xpack.ingestManager.appNavigation.epmLinkText": "集成",
"xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
"xpack.ingestManager.appNavigation.overviewLinkText": "概览",
"xpack.ingestManager.appNavigation.sendFeedbackButton": "发送反馈",
"xpack.ingestManager.appNavigation.settingsButton": "设置",
Expand All @@ -9084,9 +9082,6 @@
"xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "全部",
"xpack.ingestManager.breadcrumbs.appTitle": "采集管理器",
"xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "数据集",
"xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "代理",
"xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "注册令牌",
"xpack.ingestManager.breadcrumbs.fleetPageTitle": "Fleet",
"xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "已安装",
"xpack.ingestManager.breadcrumbs.integrationsPageTitle": "集成",
"xpack.ingestManager.breadcrumbs.overviewPageTitle": "概览",
Expand Down Expand Up @@ -9155,8 +9150,6 @@
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "未找到任何软件包",
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "搜索集成",
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "有可用更新",
"xpack.ingestManager.fleet.pageSubtitle": "管理配置更新并将其部署到一组任意大小的代理。",
"xpack.ingestManager.fleet.pageTitle": "Fleet",
"xpack.ingestManager.genericActionsMenuText": "打开",
"xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText": "关闭消息",
"xpack.ingestManager.homeIntegration.tutorialDirectory.ingestManagerAppButtonText": "试用采集管理器公测版",
Expand Down Expand Up @@ -9235,7 +9228,6 @@
"xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "您的代理收集的数据组织到各种数据集中。",
"xpack.ingestManager.overviewPageEnrollAgentButton": "添加代理",
"xpack.ingestManager.overviewPageFleetPanelAction": "查看代理",
"xpack.ingestManager.overviewPageFleetPanelTitle": "Fleet",
"xpack.ingestManager.overviewPageFleetPanelTooltip": "使用 Fleet 注册代理并从集中位置管理其配置。",
"xpack.ingestManager.overviewPageIntegrationsPanelAction": "查看集成",
"xpack.ingestManager.overviewPageIntegrationsPanelTitle": "集成",
Expand Down