diff --git a/x-pack/plugins/apm/common/backends.ts b/x-pack/plugins/apm/common/backends.ts index 35a52cf3778f1..53418fe7f9b62 100644 --- a/x-pack/plugins/apm/common/backends.ts +++ b/x-pack/plugins/apm/common/backends.ts @@ -14,9 +14,9 @@ import { import { environmentQuery } from './utils/environment_query'; export const kueryBarPlaceholder = i18n.translate( - 'xpack.apm.backends.kueryBarPlaceholder', + 'xpack.apm.dependencies.kueryBarPlaceholder', { - defaultMessage: `Search backend metrics (e.g. span.destination.service.resource:elasticsearch)`, + defaultMessage: `Search dependency metrics (e.g. span.destination.service.resource:elasticsearch)`, } ); diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts index de8969cbecdeb..b90ad12b46025 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts @@ -74,6 +74,10 @@ describe('Service Overview', () => { cy.contains('Service Map'); // Waits until the agent request is finished to check the tab. cy.wait('@agentRequest'); - cy.contains('Dependencies').should('not.exist'); + cy.get('.euiTabs .euiTab__content').then((elements) => { + elements.map((index, element) => { + expect(element.innerText).to.not.equal('Dependencies'); + }); + }); }); }); diff --git a/x-pack/plugins/apm/public/components/app/backend_detail_overview/index.tsx b/x-pack/plugins/apm/public/components/app/backend_detail_overview/index.tsx index 1adb41acab70a..2c9ec0a232974 100644 --- a/x-pack/plugins/apm/public/components/app/backend_detail_overview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/backend_detail_overview/index.tsx @@ -18,7 +18,7 @@ import { useApmParams } from '../../../hooks/use_apm_params'; import { useApmRouter } from '../../../hooks/use_apm_router'; import { SearchBar } from '../../shared/search_bar'; import { BackendLatencyChart } from './backend_latency_chart'; -import { BackendInventoryTitle } from '../../routing/home'; +import { DependenciesInventoryTitle } from '../../routing/home'; import { BackendDetailDependenciesTable } from './backend_detail_dependencies_table'; import { BackendThroughputChart } from './backend_throughput_chart'; import { BackendFailedTransactionRateChart } from './backend_error_rate_chart'; @@ -39,7 +39,7 @@ export function BackendDetailOverview() { useBreadcrumb([ { - title: BackendInventoryTitle, + title: DependenciesInventoryTitle, href: apmRouter.link('/backends', { query: { rangeFrom, rangeTo, environment, kuery }, }), diff --git a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx index 7ccf3f166fc65..ea135104982e5 100644 --- a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx +++ b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx @@ -98,9 +98,9 @@ export function BackendInventoryDependenciesTable() { dependencies={dependencies} title={null} nameColumnTitle={i18n.translate( - 'xpack.apm.backendInventory.dependenciesTableColumnBackend', + 'xpack.apm.backendInventory.dependencyTableColumn', { - defaultMessage: 'Backend', + defaultMessage: 'Dependency', } )} status={status} diff --git a/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx index 0a42dbab9a452..9bc30ee67d2c7 100644 --- a/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx +++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/backend_contents.tsx @@ -85,8 +85,8 @@ export function BackendContents({ }); }} > - {i18n.translate('xpack.apm.serviceMap.backendDetailsButtonText', { - defaultMessage: 'Backend Details', + {i18n.translate('xpack.apm.serviceMap.dependencyDetailsButtonText', { + defaultMessage: 'Dependency Details', })} diff --git a/x-pack/plugins/apm/public/components/app/service_map/Popover/popover.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/popover.test.tsx index 9678258c4740c..5bec70b9eb841 100644 --- a/x-pack/plugins/apm/public/components/app/service_map/Popover/popover.test.tsx +++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/popover.test.tsx @@ -14,12 +14,12 @@ const { Backend, ExternalsList, Resource, Service } = composeStories(stories); describe('Popover', () => { describe('with backend data', () => { - it('renders a backend link', async () => { + it('renders a dependency link', async () => { render(); await waitFor(() => { expect( - screen.getByRole('link', { name: /backend details/i }) + screen.getByRole('link', { name: /Dependency Details/i }) ).toBeInTheDocument(); }); }); diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx index 0d0842582335b..08f29d7727cda 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx @@ -125,13 +125,13 @@ export function ServiceOverviewDependenciesTable({ title={i18n.translate( 'xpack.apm.serviceOverview.dependenciesTableTitle', { - defaultMessage: 'Downstream services and backends', + defaultMessage: 'Dependencies', } )} nameColumnTitle={i18n.translate( - 'xpack.apm.serviceOverview.dependenciesTableColumnBackend', + 'xpack.apm.serviceOverview.dependenciesTableColumn', { - defaultMessage: 'Backend', + defaultMessage: 'Dependency', } )} status={status} diff --git a/x-pack/plugins/apm/public/components/routing/home/index.tsx b/x-pack/plugins/apm/public/components/routing/home/index.tsx index d1304e192ddce..1430f5d8e4756 100644 --- a/x-pack/plugins/apm/public/components/routing/home/index.tsx +++ b/x-pack/plugins/apm/public/components/routing/home/index.tsx @@ -45,10 +45,10 @@ export const ServiceInventoryTitle = i18n.translate( } ); -export const BackendInventoryTitle = i18n.translate( - 'xpack.apm.views.backendInventory.title', +export const DependenciesInventoryTitle = i18n.translate( + 'xpack.apm.views.dependenciesInventory.title', { - defaultMessage: 'Backends', + defaultMessage: 'Dependencies', } ); @@ -114,7 +114,7 @@ export const home = { }, page({ path: '/', - title: BackendInventoryTitle, + title: DependenciesInventoryTitle, element: , }), ], diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts index a329ad57e2b33..da2ea0ba8ae5c 100644 --- a/x-pack/plugins/apm/public/plugin.ts +++ b/x-pack/plugins/apm/public/plugin.ts @@ -93,9 +93,12 @@ const serviceMapTitle = i18n.translate('xpack.apm.navigation.serviceMapTitle', { defaultMessage: 'Service Map', }); -const backendsTitle = i18n.translate('xpack.apm.navigation.backendsTitle', { - defaultMessage: 'Backends', -}); +const dependenciesTitle = i18n.translate( + 'xpack.apm.navigation.dependenciesTitle', + { + defaultMessage: 'Dependencies', + } +); export class ApmPlugin implements Plugin { constructor( @@ -126,7 +129,7 @@ export class ApmPlugin implements Plugin { { label: servicesTitle, app: 'apm', path: '/services' }, { label: tracesTitle, app: 'apm', path: '/traces' }, { - label: backendsTitle, + label: dependenciesTitle, app: 'apm', path: '/backends', isNewFeature: true, @@ -270,7 +273,7 @@ export class ApmPlugin implements Plugin { { id: 'services', title: servicesTitle, path: '/services' }, { id: 'traces', title: tracesTitle, path: '/traces' }, { id: 'service-map', title: serviceMapTitle, path: '/service-map' }, - { id: 'backends', title: backendsTitle, path: '/backends' }, + { id: 'backends', title: dependenciesTitle, path: '/backends' }, ], async mount(appMountParameters: AppMountParameters) { diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 14da12d6f2c5c..47043c9776ea0 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -5740,7 +5740,6 @@ "xpack.apm.serviceNodeMetrics.unidentifiedServiceNodesWarningTitle": "JVM を特定できませんでした", "xpack.apm.serviceNodeNameMissing": " (空) ", "xpack.apm.serviceOveriew.errorsTableOccurrences": "{occurrencesCount} occ.", - "xpack.apm.serviceOverview.dependenciesTableColumnBackend": "バックエンド", "xpack.apm.serviceOverview.dependenciesTableTitle": "依存関係", "xpack.apm.serviceOverview.errorsTableColumnLastSeen": "前回の認識", "xpack.apm.serviceOverview.errorsTableColumnName": "名前", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 6cc97663f37a1..f67c1e155561e 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -5769,7 +5769,6 @@ "xpack.apm.serviceNodeMetrics.unidentifiedServiceNodesWarningTitle": "找不到 JVM", "xpack.apm.serviceNodeNameMissing": "（空）", "xpack.apm.serviceOveriew.errorsTableOccurrences": "{occurrencesCount} 次", - "xpack.apm.serviceOverview.dependenciesTableColumnBackend": "后端", "xpack.apm.serviceOverview.dependenciesTableTitle": "依赖项", "xpack.apm.serviceOverview.errorsTableColumnLastSeen": "最后看到时间", "xpack.apm.serviceOverview.errorsTableColumnName": "名称",