Skip to content

Commit

Permalink
[8.x] [Infra] Amend inventory title to "Infrastructure Inventory…
Browse files Browse the repository at this point in the history
…" (#193189) (#193523)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Infra] Amend inventory title to "Infrastructure Inventory"
(#193189)](#193189)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Gonçalo Rica Pais da
Silva","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-20T09:41:47Z","message":"[Infra]
Amend inventory title to \"Infrastructure Inventory\" (#193189)\n\n##
Summary\r\n\r\nUpdate the Inventory title terminology to be
\"Infrastructure Inventory\",\r\nin order to differentiate from the
incoming top-level \"Inventory\" page.\r\n\r\n<img width=\"481\"
alt=\"Screenshot 2024-09-17
170745\"\r\nsrc=\"https://github.com/user-attachments/assets/d72dfb6e-fe3b-44d8-b6f0-ae333586ceb4\">\r\n\r\nCloses
#192324 \r\n\r\n# How to test\r\n\r\n- Load Elastic cluster, go to
Infrastructure -> Infrastructure Inventory\r\n\r\n**Expected**: The side
menu link text should match the breadcrumb title\r\nand the main title
text for the page.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic
Machine
<[email protected]>","sha":"04c3486878efed32e99fd4d17c893f69a10ed9ab","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-infra_services"],"title":"[Infra]
Amend inventory title to \"Infrastructure
Inventory\"","number":193189,"url":"https://github.com/elastic/kibana/pull/193189","mergeCommit":{"message":"[Infra]
Amend inventory title to \"Infrastructure Inventory\" (#193189)\n\n##
Summary\r\n\r\nUpdate the Inventory title terminology to be
\"Infrastructure Inventory\",\r\nin order to differentiate from the
incoming top-level \"Inventory\" page.\r\n\r\n<img width=\"481\"
alt=\"Screenshot 2024-09-17
170745\"\r\nsrc=\"https://github.com/user-attachments/assets/d72dfb6e-fe3b-44d8-b6f0-ae333586ceb4\">\r\n\r\nCloses
#192324 \r\n\r\n# How to test\r\n\r\n- Load Elastic cluster, go to
Infrastructure -> Infrastructure Inventory\r\n\r\n**Expected**: The side
menu link text should match the breadcrumb title\r\nand the main title
text for the page.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic
Machine
<[email protected]>","sha":"04c3486878efed32e99fd4d17c893f69a10ed9ab"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193189","number":193189,"mergeCommit":{"message":"[Infra]
Amend inventory title to \"Infrastructure Inventory\" (#193189)\n\n##
Summary\r\n\r\nUpdate the Inventory title terminology to be
\"Infrastructure Inventory\",\r\nin order to differentiate from the
incoming top-level \"Inventory\" page.\r\n\r\n<img width=\"481\"
alt=\"Screenshot 2024-09-17
170745\"\r\nsrc=\"https://github.com/user-attachments/assets/d72dfb6e-fe3b-44d8-b6f0-ae333586ceb4\">\r\n\r\nCloses
#192324 \r\n\r\n# How to test\r\n\r\n- Load Elastic cluster, go to
Infrastructure -> Infrastructure Inventory\r\n\r\n**Expected**: The side
menu link text should match the breadcrumb title\r\nand the main title
text for the page.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic
Machine
<[email protected]>","sha":"04c3486878efed32e99fd4d17c893f69a10ed9ab"}}]}]
BACKPORT-->

Co-authored-by: Gonçalo Rica Pais da Silva <[email protected]>
  • Loading branch information
kibanamachine and Bluefinger authored Sep 20, 2024
1 parent 2aa9358 commit 1827d2e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 22 deletions.
23 changes: 16 additions & 7 deletions x-pack/plugins/observability_solution/infra/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import type {
} from './types';
import { getLogsHasDataFetcher, getLogsOverviewDataFetcher } from './utils/logs_overview_fetchers';
import type { LogStreamSerializedState } from './components/log_stream/types';
import { hostsTitle, inventoryTitle, metricsExplorerTitle, metricsTitle } from './translations';

export class Plugin implements InfraClientPluginClass {
public config: InfraPublicConfig;
Expand Down Expand Up @@ -163,17 +164,27 @@ export class Plugin implements InfraClientPluginClass {
...(capabilities.infrastructure.show
? [
{
label: 'Infrastructure',
label: metricsTitle,
sortKey: 300,
entries: [
{ label: 'Inventory', app: 'metrics', path: '/inventory' },
{
label: inventoryTitle,
app: 'metrics',
path: '/inventory',
},
...(this.config.featureFlags.metricsExplorerEnabled
? [{ label: 'Metrics Explorer', app: 'metrics', path: '/explorer' }]
? [
{
label: metricsExplorerTitle,
app: 'metrics',
path: '/explorer',
},
]
: []),
...(isInfrastructureHostsViewEnabled
? [
{
label: 'Hosts',
label: hostsTitle,
app: 'metrics',
path: '/hosts',
},
Expand Down Expand Up @@ -269,9 +280,7 @@ export class Plugin implements InfraClientPluginClass {
return [
{
id: 'inventory',
title: i18n.translate('xpack.infra.homePage.inventoryTabTitle', {
defaultMessage: 'Inventory',
}),
title: inventoryTitle,
path: '/inventory',
visibleIn,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export const metricsTitle = i18n.translate('xpack.infra.header.infrastructureTit
defaultMessage: 'Infrastructure',
});

export const inventoryTitle = i18n.translate('xpack.infra.metrics.inventoryPageTitle', {
defaultMessage: 'Inventory',
export const inventoryTitle = i18n.translate('xpack.infra.metrics.infrastructureInventoryTitle', {
defaultMessage: 'Infrastructure Inventory',
});

export const metricsExplorerTitle = i18n.translate('xpack.infra.metrics.metricsExplorerTitle', {
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -23007,7 +23007,6 @@
"xpack.infra.header.logsTitle": "Logs",
"xpack.infra.header.observabilityTitle": "Observability",
"xpack.infra.hideHistory": "Masquer l'historique",
"xpack.infra.homePage.inventoryTabTitle": "Inventory",
"xpack.infra.homePage.kubernetesToastButton": "Démarrer l'enquête",
"xpack.infra.homePage.kubernetesToastText": "Aidez-nous à concevoir votre expérience Kubernetes en répondant à l'enquête de satisfaction.",
"xpack.infra.homePage.kubernetesToastTitle": "Nous avons besoin de votre aide !",
Expand Down Expand Up @@ -23567,7 +23566,6 @@
"xpack.infra.metrics.invalidNodeErrorTitle": "Il semblerait que {nodeName} ne collecte aucune donnée d'indicateurs",
"xpack.infra.metrics.inventory.alertFlyout.alertDescription": "Alerte lorsque l'inventaire dépasse un seuil défini.",
"xpack.infra.metrics.inventory.alertName": "Inventaire",
"xpack.infra.metrics.inventoryPageTitle": "Inventaire",
"xpack.infra.metrics.loadingNodeDataText": "Chargement des données",
"xpack.infra.metrics.metricsExplorerTitle": "Metrics Explorer",
"xpack.infra.metrics.missingTSVBModelError": "Le modèle TSVB pour {metricId} n'existe pas pour {nodeType}",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -22997,7 +22997,6 @@
"xpack.infra.header.logsTitle": "ログ",
"xpack.infra.header.observabilityTitle": "Observability",
"xpack.infra.hideHistory": "履歴を表示しない",
"xpack.infra.homePage.inventoryTabTitle": "インベントリ",
"xpack.infra.homePage.kubernetesToastButton": "調査を開始",
"xpack.infra.homePage.kubernetesToastText": "フィードバックアンケートに答えて、Kubernetes経験の設計を支援してください。",
"xpack.infra.homePage.kubernetesToastTitle": "ご協力をお願いします。",
Expand Down Expand Up @@ -23555,7 +23554,6 @@
"xpack.infra.metrics.invalidNodeErrorTitle": "{nodeName} がメトリックデータを収集していないようです",
"xpack.infra.metrics.inventory.alertFlyout.alertDescription": "インベントリが定義されたしきい値を超えたときにアラートを発行します。",
"xpack.infra.metrics.inventory.alertName": "インベントリ",
"xpack.infra.metrics.inventoryPageTitle": "インベントリ",
"xpack.infra.metrics.loadingNodeDataText": "データを読み込み中",
"xpack.infra.metrics.metricsExplorerTitle": "メトリックエクスプローラー",
"xpack.infra.metrics.missingTSVBModelError": "{nodeType}では{metricId}の TSVB モデルが存在しません",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -23025,7 +23025,6 @@
"xpack.infra.header.logsTitle": "日志",
"xpack.infra.header.observabilityTitle": "Observability",
"xpack.infra.hideHistory": "隐藏历史记录",
"xpack.infra.homePage.inventoryTabTitle": "库存",
"xpack.infra.homePage.kubernetesToastButton": "开始调查",
"xpack.infra.homePage.kubernetesToastText": "通过完成反馈调查帮助我们设计您的 Kubernetes 体验。",
"xpack.infra.homePage.kubernetesToastTitle": "我们需要您的帮助!",
Expand Down Expand Up @@ -23585,7 +23584,6 @@
"xpack.infra.metrics.invalidNodeErrorTitle": "似乎 {nodeName} 未在收集任何指标数据",
"xpack.infra.metrics.inventory.alertFlyout.alertDescription": "当库存超过定义的阈值时告警。",
"xpack.infra.metrics.inventory.alertName": "库存",
"xpack.infra.metrics.inventoryPageTitle": "库存",
"xpack.infra.metrics.loadingNodeDataText": "正在加载数据",
"xpack.infra.metrics.metricsExplorerTitle": "指标浏览器",
"xpack.infra.metrics.missingTSVBModelError": "{nodeType} 的 {metricId} TSVB 模型不存在",
Expand Down
10 changes: 6 additions & 4 deletions x-pack/test/functional/apps/infra/home_page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.header.waitUntilLoadingHasFinished();

const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain('Inventory - Infrastructure - Observability - Elastic');
expect(documentTitle).to.contain(
'Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

it('renders the inventory survey link', async () => {
Expand Down Expand Up @@ -457,7 +459,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await retry.tryForTime(5000, async () => {
const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain(
'host-5 - Inventory - Infrastructure - Observability - Elastic'
'host-5 - Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

Expand All @@ -474,7 +476,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await retry.tryForTime(5000, async () => {
const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain(
'pod-0 - Inventory - Infrastructure - Observability - Elastic'
'pod-0 - Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

Expand All @@ -492,7 +494,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await retry.tryForTime(5000, async () => {
const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain(
'container-id-4 - Inventory - Infrastructure - Observability - Elastic'
'container-id-4 - Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.header.waitUntilLoadingHasFinished();

const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain('Inventory - Infrastructure - Observability - Elastic');
expect(documentTitle).to.contain(
'Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

it('renders an empty data prompt for dates with no data', async () => {
Expand Down Expand Up @@ -85,7 +87,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await retry.try(async () => {
const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain(
'demo-stack-redis-01 - Inventory - Infrastructure - Observability - Elastic'
'demo-stack-redis-01 - Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

Expand All @@ -101,7 +103,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await retry.try(async () => {
const documentTitle = await browser.getTitle();
expect(documentTitle).to.contain(
'pod-0 - Inventory - Infrastructure - Observability - Elastic'
'pod-0 - Infrastructure Inventory - Infrastructure - Observability - Elastic'
);
});

Expand Down

0 comments on commit 1827d2e

Please sign in to comment.