Skip to content

Commit cfa5074

Browse files
authored
[Fleet] Rename Ingest Manager => Fleet, Fleet => Agents in the UI (#78685)
1 parent cd8d512 commit cfa5074

File tree

9 files changed

+19
-46
lines changed

9 files changed

+19
-46
lines changed

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { useCore } from './use_core';
1111
const BASE_BREADCRUMB: ChromeBreadcrumb = {
1212
href: pagePathGetters.overview(),
1313
text: i18n.translate('xpack.ingestManager.breadcrumbs.appTitle', {
14-
defaultMessage: 'Ingest Manager',
14+
defaultMessage: 'Fleet',
1515
}),
1616
};
1717

@@ -155,21 +155,15 @@ const breadcrumbGetters: {
155155
fleet: () => [
156156
BASE_BREADCRUMB,
157157
{
158-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
159-
defaultMessage: 'Fleet',
158+
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
159+
defaultMessage: 'Agents',
160160
}),
161161
},
162162
],
163163
fleet_agent_list: () => [
164164
BASE_BREADCRUMB,
165165
{
166-
href: pagePathGetters.fleet(),
167-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
168-
defaultMessage: 'Fleet',
169-
}),
170-
},
171-
{
172-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle', {
166+
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
173167
defaultMessage: 'Agents',
174168
}),
175169
},
@@ -178,12 +172,7 @@ const breadcrumbGetters: {
178172
BASE_BREADCRUMB,
179173
{
180174
href: pagePathGetters.fleet(),
181-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
182-
defaultMessage: 'Fleet',
183-
}),
184-
},
185-
{
186-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle', {
175+
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
187176
defaultMessage: 'Agents',
188177
}),
189178
},
@@ -193,12 +182,12 @@ const breadcrumbGetters: {
193182
BASE_BREADCRUMB,
194183
{
195184
href: pagePathGetters.fleet(),
196-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetPageTitle', {
197-
defaultMessage: 'Fleet',
185+
text: i18n.translate('xpack.ingestManager.breadcrumbs.agentsPageTitle', {
186+
defaultMessage: 'Agents',
198187
}),
199188
},
200189
{
201-
text: i18n.translate('xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle', {
190+
text: i18n.translate('xpack.ingestManager.breadcrumbs.enrollmentTokensPageTitle', {
202191
defaultMessage: 'Enrollment tokens',
203192
}),
204193
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
8383
disabled={!fleet?.enabled}
8484
>
8585
<FormattedMessage
86-
id="xpack.ingestManager.appNavigation.fleetLinkText"
87-
defaultMessage="Fleet"
86+
id="xpack.ingestManager.appNavigation.agentsLinkText"
87+
defaultMessage="Agents"
8888
/>
8989
</EuiTab>
9090
<EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
7474
) : (
7575
<>
7676
<FormattedMessage
77-
id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
77+
id="xpack.ingestManager.agentEnrollment.agentsNotInitializedText"
7878
defaultMessage="Before enrolling agents, {link}."
7979
values={{
8080
link: (
8181
<EuiLink href={getHref('fleet')}>
8282
<FormattedMessage
83-
id="xpack.ingestManager.agentEnrollment.setUpFleetLink"
84-
defaultMessage="set up Fleet"
83+
id="xpack.ingestManager.agentEnrollment.setUpAgentsLink"
84+
defaultMessage="set up Agents"
8585
/>
8686
</EuiLink>
8787
),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
126126
<EuiFlexItem>
127127
<EuiText>
128128
<h1>
129-
<FormattedMessage id="xpack.ingestManager.fleet.pageTitle" defaultMessage="Fleet" />
129+
<FormattedMessage id="xpack.ingestManager.agents.pageTitle" defaultMessage="Agents" />
130130
</h1>
131131
</EuiText>
132132
</EuiFlexItem>
133133
<EuiFlexItem>
134134
<EuiText color="subdued">
135135
<p>
136136
<FormattedMessage
137-
id="xpack.ingestManager.fleet.pageSubtitle"
137+
id="xpack.ingestManager.agents.pageSubtitle"
138138
defaultMessage="Manage and deploy policy updates to a group of agents of any size."
139139
/>
140140
</p>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ export const OverviewAgentSection = () => {
2525
return (
2626
<EuiFlexItem component="section">
2727
<OverviewPanel
28-
title={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTitle', {
29-
defaultMessage: 'Fleet',
28+
title={i18n.translate('xpack.ingestManager.overviewPageAgentsPanelTitle', {
29+
defaultMessage: 'Agents',
3030
})}
3131
tooltip={i18n.translate('xpack.ingestManager.overviewPageFleetPanelTooltip', {
3232
defaultMessage:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const IngestManagerOverview: React.FunctionComponent = () => {
4747
<h1>
4848
<FormattedMessage
4949
id="xpack.ingestManager.overviewPageTitle"
50-
defaultMessage="Ingest Manager"
50+
defaultMessage="Fleet"
5151
/>
5252
</h1>
5353
</EuiTitle>

x-pack/plugins/ingest_manager/public/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class IngestManagerPlugin
7878
core.application.register({
7979
id: PLUGIN_ID,
8080
category: DEFAULT_APP_CATEGORIES.management,
81-
title: i18n.translate('xpack.ingestManager.appTitle', { defaultMessage: 'Ingest Manager' }),
81+
title: i18n.translate('xpack.ingestManager.appTitle', { defaultMessage: 'Fleet' }),
8282
order: 9020,
8383
euiIconType: 'logoElastic',
8484
async mount(params: AppMountParameters) {

x-pack/plugins/translations/translations/ja-JP.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8986,7 +8986,6 @@
89868986
"xpack.ingestManager.agentEnrollment.downloadLink": "elastic.co/downloadsに移動",
89878987
"xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "フリートに登録",
89888988
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "スタンドアロンモード",
8989-
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "エージェントを登録する前に、フリートを設定する必要があります。{link}",
89908989
"xpack.ingestManager.agentEnrollment.flyoutTitle": "エージェントの追加",
89918990
"xpack.ingestManager.agentEnrollment.managedDescription": "必要なエージェントの数に関係なく、Fleetでは、簡単に一元的に更新を管理し、エージェントにデプロイすることができます。次の手順に従い、Elasticエージェントをダウンロードし、Fleetに登録してください。",
89928991
"xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
@@ -9068,7 +9067,6 @@
90689067
"xpack.ingestManager.alphaMessging.closeFlyoutLabel": "閉じる",
90699068
"xpack.ingestManager.appNavigation.dataStreamsLinkText": "データセット",
90709069
"xpack.ingestManager.appNavigation.epmLinkText": "統合",
9071-
"xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
90729070
"xpack.ingestManager.appNavigation.overviewLinkText": "概要",
90739071
"xpack.ingestManager.appNavigation.sendFeedbackButton": "フィードバックを送信",
90749072
"xpack.ingestManager.appNavigation.settingsButton": "設定",
@@ -9078,9 +9076,6 @@
90789076
"xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "すべて",
90799077
"xpack.ingestManager.breadcrumbs.appTitle": "Ingest Manager",
90809078
"xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "データセット",
9081-
"xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "エージェント",
9082-
"xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "登録トークン",
9083-
"xpack.ingestManager.breadcrumbs.fleetPageTitle": "フリート",
90849079
"xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
90859080
"xpack.ingestManager.breadcrumbs.integrationsPageTitle": "統合",
90869081
"xpack.ingestManager.breadcrumbs.overviewPageTitle": "概要",
@@ -9149,8 +9144,6 @@
91499144
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "パッケージが見つかりません",
91509145
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "統合を検索",
91519146
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "更新が可能です",
9152-
"xpack.ingestManager.fleet.pageSubtitle": "構成の更新を管理し、任意のサイズのエージェントのグループにデプロイします。",
9153-
"xpack.ingestManager.fleet.pageTitle": "フリート",
91549147
"xpack.ingestManager.genericActionsMenuText": "開く",
91559148
"xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText": "メッセージを消去",
91569149
"xpack.ingestManager.homeIntegration.tutorialDirectory.ingestManagerAppButtonText": "Ingest Managerベータを試す",
@@ -9229,7 +9222,6 @@
92299222
"xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "エージェントが収集するデータはさまざまなデータセットに整理されます。",
92309223
"xpack.ingestManager.overviewPageEnrollAgentButton": "エージェントの追加",
92319224
"xpack.ingestManager.overviewPageFleetPanelAction": "エージェントを表示",
9232-
"xpack.ingestManager.overviewPageFleetPanelTitle": "フリート",
92339225
"xpack.ingestManager.overviewPageFleetPanelTooltip": "Fleetを使用して、中央の場所からエージェントを登録し、構成を管理します。",
92349226
"xpack.ingestManager.overviewPageIntegrationsPanelAction": "統合を表示",
92359227
"xpack.ingestManager.overviewPageIntegrationsPanelTitle": "統合",

x-pack/plugins/translations/translations/zh-CN.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8992,7 +8992,6 @@
89928992
"xpack.ingestManager.agentEnrollment.downloadLink": "前往 elastic.co/downloads",
89938993
"xpack.ingestManager.agentEnrollment.enrollFleetTabLabel": "注册到 Fleet",
89948994
"xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "独立模式",
8995-
"xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "注册代理前需要设置 Fleet。{link}",
89968995
"xpack.ingestManager.agentEnrollment.flyoutTitle": "添加代理",
89978996
"xpack.ingestManager.agentEnrollment.managedDescription": "无论是需要一个代理还是需要数以千计的代理,Fleet 允许您轻松地集中管理并部署代理的更新。按照下面的说明下载 Elastic 代理并将代理注册到 Fleet。",
89988997
"xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改,则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
@@ -9074,7 +9073,6 @@
90749073
"xpack.ingestManager.alphaMessging.closeFlyoutLabel": "关闭",
90759074
"xpack.ingestManager.appNavigation.dataStreamsLinkText": "数据集",
90769075
"xpack.ingestManager.appNavigation.epmLinkText": "集成",
9077-
"xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
90789076
"xpack.ingestManager.appNavigation.overviewLinkText": "概览",
90799077
"xpack.ingestManager.appNavigation.sendFeedbackButton": "发送反馈",
90809078
"xpack.ingestManager.appNavigation.settingsButton": "设置",
@@ -9084,9 +9082,6 @@
90849082
"xpack.ingestManager.breadcrumbs.allIntegrationsPageTitle": "全部",
90859083
"xpack.ingestManager.breadcrumbs.appTitle": "采集管理器",
90869084
"xpack.ingestManager.breadcrumbs.datastreamsPageTitle": "数据集",
9087-
"xpack.ingestManager.breadcrumbs.fleetAgentsPageTitle": "代理",
9088-
"xpack.ingestManager.breadcrumbs.fleetEnrollmentTokensPageTitle": "注册令牌",
9089-
"xpack.ingestManager.breadcrumbs.fleetPageTitle": "Fleet",
90909085
"xpack.ingestManager.breadcrumbs.installedIntegrationsPageTitle": "已安装",
90919086
"xpack.ingestManager.breadcrumbs.integrationsPageTitle": "集成",
90929087
"xpack.ingestManager.breadcrumbs.overviewPageTitle": "概览",
@@ -9155,8 +9150,6 @@
91559150
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "未找到任何软件包",
91569151
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "搜索集成",
91579152
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "有可用更新",
9158-
"xpack.ingestManager.fleet.pageSubtitle": "管理配置更新并将其部署到一组任意大小的代理。",
9159-
"xpack.ingestManager.fleet.pageTitle": "Fleet",
91609153
"xpack.ingestManager.genericActionsMenuText": "打开",
91619154
"xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText": "关闭消息",
91629155
"xpack.ingestManager.homeIntegration.tutorialDirectory.ingestManagerAppButtonText": "试用采集管理器公测版",
@@ -9235,7 +9228,6 @@
92359228
"xpack.ingestManager.overviewPageDataStreamsPanelTooltip": "您的代理收集的数据组织到各种数据集中。",
92369229
"xpack.ingestManager.overviewPageEnrollAgentButton": "添加代理",
92379230
"xpack.ingestManager.overviewPageFleetPanelAction": "查看代理",
9238-
"xpack.ingestManager.overviewPageFleetPanelTitle": "Fleet",
92399231
"xpack.ingestManager.overviewPageFleetPanelTooltip": "使用 Fleet 注册代理并从集中位置管理其配置。",
92409232
"xpack.ingestManager.overviewPageIntegrationsPanelAction": "查看集成",
92419233
"xpack.ingestManager.overviewPageIntegrationsPanelTitle": "集成",

0 commit comments

Comments
 (0)