Skip to content

Commit

Permalink
[Infra UI] Rename Disk Usage charts (elastic#165961)
Browse files Browse the repository at this point in the history
Closes elastic#165812 

## Summary

This PR renames:
- Disk Space / Disk Space Usage to Disk Usage
- Disk Space by Mount Point to Disk Usage by Mount Point
- Disk Space Usage (avg.)  to Disk Usage  (avg.)
 
in hosts view table and charts (as well as in the asset details view and
host flyout).

## Testing 

Open hosts view and check the [issue
description](elastic#165812 (comment))
to see which titles have changed. Example testing steps:



https://github.com/elastic/kibana/assets/14139027/1404b215-bd45-48d7-96ca-ccc3c575123c
  • Loading branch information
jennypavlova authored Sep 8, 2023
1 parent 41b124d commit 241f67b
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
diskWriteThroughput,
diskSpaceAvailability,
diskSpaceAvailable,
diskSpaceUsage,
diskUsage,
logRate,
normalizedLoad1m,
load1m,
Expand Down Expand Up @@ -58,7 +58,7 @@ export const hostLensFormulas = {
diskWriteThroughput,
diskSpaceAvailability,
diskSpaceAvailable,
diskSpaceUsage,
diskUsage,
hostCount,
logRate,
normalizedLoad1m,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ export const hostKPICharts: KPIChartProps[] = [
},
{
id: 'diskSpaceUsage',
title: i18n.translate('xpack.infra.assetDetailsEmbeddable.overview.kpi.diskSpaceUsage.title', {
defaultMessage: 'Disk Space Usage',
title: i18n.translate('xpack.infra.assetDetailsEmbeddable.overview.kpi.diskUsage.title', {
defaultMessage: 'Disk Usage',
}),
layers: {
data: {
...hostLensFormulas.diskSpaceUsage,
format: hostLensFormulas.diskSpaceUsage.format
...hostLensFormulas.diskUsage,
format: hostLensFormulas.diskUsage.format
? {
...hostLensFormulas.diskSpaceUsage.format,
...hostLensFormulas.diskUsage.format,
params: {
decimals: 1,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
diskSpaceUsageAvailable,
diskThroughputReadWrite,
diskIOReadWrite,
diskSpaceUsageByMountPoint,
diskUsageByMountPoint,
} from '../metric_charts/disk';
import { logRate } from '../metric_charts/log';
import { memoryUsage, memoryUsageBreakdown } from '../metric_charts/memory';
Expand All @@ -22,7 +22,7 @@ export const hostMetricFlyoutCharts: XYConfig[] = [
normalizedLoad1m,
logRate,
diskSpaceUsageAvailable,
diskSpaceUsageByMountPoint,
diskUsageByMountPoint,
diskThroughputReadWrite,
diskIOReadWrite,
rxTx,
Expand All @@ -37,7 +37,7 @@ export const hostMetricChartsFullPage: XYConfig[] = [
loadBreakdown,
logRate,
diskSpaceUsageAvailable,
diskSpaceUsageByMountPoint,
diskUsageByMountPoint,
diskThroughputReadWrite,
diskIOReadWrite,
rxTx,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ const TOP_VALUES_SIZE = 5;

export const diskSpaceUsageAvailable: XYConfig = {
id: 'diskSpaceUsageAvailable',
title: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskSpace', {
defaultMessage: 'Disk Space',
title: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskUsage', {
defaultMessage: 'Disk Usage',
}),
layers: [
{
data: [
{
...hostLensFormulas.diskSpaceUsage,
label: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskSpace.label.used', {
...hostLensFormulas.diskUsage,
label: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskUsage.label.used', {
defaultMessage: 'Used',
}),
},
{
...hostLensFormulas.diskSpaceAvailability,
label: i18n.translate(
'xpack.infra.assetDetails.metricsCharts.diskSpace.label.available',
'xpack.infra.assetDetails.metricsCharts.diskUsage.label.available',
{
defaultMessage: 'Available',
}
Expand All @@ -49,17 +49,17 @@ export const diskSpaceUsageAvailable: XYConfig = {
dataViewOrigin: 'metrics',
};

export const diskSpaceUsageByMountPoint: XYConfig = {
id: 'DiskSpaceUsageByMountPoint',
title: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskSpaceByMountingPoint', {
defaultMessage: 'Disk Space by Mount Point',
export const diskUsageByMountPoint: XYConfig = {
id: 'DiskUsageByMountPoint',
title: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskUsageByMountingPoint', {
defaultMessage: 'Disk Usage by Mount Point',
}),
layers: [
{
data: [
{
...hostLensFormulas.diskSpaceUsage,
label: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskSpace.label.used', {
...hostLensFormulas.diskUsage,
label: i18n.translate('xpack.infra.assetDetails.metricsCharts.diskUsage.label.used', {
defaultMessage: 'Used',
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ export const hostsMetricCharts: Array<
},
{
id: 'diskSpaceUsed',
title: i18n.translate('xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceUsed', {
defaultMessage: 'Disk Space Usage',
title: i18n.translate('xpack.infra.hostsViewPage.tabs.metricsCharts.diskUsage', {
defaultMessage: 'Disk Usage',
}),
layers: [
{
data: [hostLensFormulas.diskSpaceUsage],
data: [hostLensFormulas.diskUsage],
options: XY_LAYER_OPTIONS,
type: 'visualization',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import type { FormulaValueConfig } from '@kbn/lens-embeddable-utils';

export const diskSpaceUsage: FormulaValueConfig = {
label: 'Disk Space Usage',
export const diskUsage: FormulaValueConfig = {
label: 'Disk Usage',
value: 'average(system.filesystem.used.pct)',
format: {
id: 'percent',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export { diskReadThroughput } from './disk_read_throughput';
export { diskWriteThroughput } from './disk_write_throughput';
export { diskSpaceAvailability } from './disk_space_availability';
export { diskSpaceAvailable } from './disk_space_available';
export { diskSpaceUsage } from './disk_space_usage';
export { diskUsage } from './disk_usage';
export { hostCount } from './host_count';
export { logRate } from './log_rate';
export { normalizedLoad1m } from './normalized_load_1m';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export const useHostsTable = () => {
<ColumnHeader
label={TABLE_COLUMN_LABEL.diskSpaceUsage}
toolTip={METRICS_TOOLTIP.diskSpaceUsage}
formula={hostLensFormulas.diskSpaceUsage.value}
formula={hostLensFormulas.diskUsage.value}
/>
),
field: 'diskSpaceUsage',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const TABLE_COLUMN_LABEL = {
defaultMessage: 'CPU usage (avg.)',
}),

diskSpaceUsage: i18n.translate('xpack.infra.hostsViewPage.table.diskSpaceUsageColumnHeader', {
defaultMessage: 'Disk Space Usage (avg.)',
diskSpaceUsage: i18n.translate('xpack.infra.hostsViewPage.table.diskUsageColumnHeader', {
defaultMessage: 'Disk Usage (avg.)',
}),

tx: i18n.translate('xpack.infra.hostsViewPage.table.txColumnHeader', {
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -18661,7 +18661,6 @@
"xpack.infra.assetDetailsEmbeddable.displayName": "Détails de ressource",
"xpack.infra.assetDetailsEmbeddable.title": "Détails de ressource",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.cpuUsage.title": "Utilisation CPU",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.diskSpaceUsage.title": "Utilisation de l’espace disque",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.memoryUsage.title": "Utilisation mémoire",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.normalizedLoad1m.title": "Charge normalisée",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.subtitle.average": "Moyenne",
Expand Down Expand Up @@ -18768,7 +18767,6 @@
"xpack.infra.hostsViewPage.metrics.tooltip.tx": "Nombre d'octets envoyés par seconde sur les interfaces publiques des hôtes.",
"xpack.infra.hostsViewPage.table.addFilter": "Ajouter un filtre",
"xpack.infra.hostsViewPage.table.cpuUsageColumnHeader": "Utilisation CPU (moy.)",
"xpack.infra.hostsViewPage.table.diskSpaceUsageColumnHeader": "Utilisation de l’espace disque (moy.)",
"xpack.infra.hostsViewPage.table.memoryFreeColumnHeader": "Sans mémoire (moy.)",
"xpack.infra.hostsViewPage.table.memoryUsageColumnHeader": "Utilisation de la mémoire (moy.)",
"xpack.infra.hostsViewPage.table.nameColumnHeader": "Nom",
Expand All @@ -18794,7 +18792,6 @@
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskIOWrite": "Entrées et sorties par seconde en écriture sur le disque",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskReadThroughput": "Rendement de lecture du disque",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceAvailable": "Espace disque disponible",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceUsed": "Utilisation de l’espace disque",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskWriteThroughput": "Rendement d’écriture du disque",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryFree": "Sans mémoire",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryUsage": "Utilisation mémoire",
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -18675,7 +18675,6 @@
"xpack.infra.assetDetailsEmbeddable.displayName": "アセット詳細",
"xpack.infra.assetDetailsEmbeddable.title": "アセット詳細",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.cpuUsage.title": "CPU使用状況",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.diskSpaceUsage.title": "ディスク容量使用状況",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.memoryUsage.title": "メモリー使用状況",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.normalizedLoad1m.title": "正規化された負荷",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.subtitle.average": "平均",
Expand Down Expand Up @@ -18782,7 +18781,6 @@
"xpack.infra.hostsViewPage.metrics.tooltip.tx": "ホストのパブリックインターフェースで1秒間に送信したバイト数。",
"xpack.infra.hostsViewPage.table.addFilter": "フィルターを追加します",
"xpack.infra.hostsViewPage.table.cpuUsageColumnHeader": "CPU使用状況(平均)",
"xpack.infra.hostsViewPage.table.diskSpaceUsageColumnHeader": "ディスク容量使用状況(平均)",
"xpack.infra.hostsViewPage.table.memoryFreeColumnHeader": "空きメモリー(平均)",
"xpack.infra.hostsViewPage.table.memoryUsageColumnHeader": "メモリー使用状況(平均)",
"xpack.infra.hostsViewPage.table.nameColumnHeader": "名前",
Expand All @@ -18808,7 +18806,6 @@
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskIOWrite": "ディスク書き込みIOPS",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskReadThroughput": "ディスク読み取りスループット",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceAvailable": "空きディスク容量",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceUsed": "ディスク容量使用状況",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskWriteThroughput": "ディスク書き込みスループット",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryFree": "空きメモリー",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryUsage": "メモリー使用状況",
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -18675,7 +18675,6 @@
"xpack.infra.assetDetailsEmbeddable.displayName": "资产详情",
"xpack.infra.assetDetailsEmbeddable.title": "资产详情",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.cpuUsage.title": "CPU 使用率",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.diskSpaceUsage.title": "磁盘空间使用率",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.memoryUsage.title": "内存利用率",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.normalizedLoad1m.title": "标准化负载",
"xpack.infra.assetDetailsEmbeddable.overview.kpi.subtitle.average": "平均值",
Expand Down Expand Up @@ -18782,7 +18781,6 @@
"xpack.infra.hostsViewPage.metrics.tooltip.tx": "主机的公共接口上每秒发送的字节数。",
"xpack.infra.hostsViewPage.table.addFilter": "添加筛选",
"xpack.infra.hostsViewPage.table.cpuUsageColumnHeader": "CPU 使用率(平均值)",
"xpack.infra.hostsViewPage.table.diskSpaceUsageColumnHeader": "磁盘空间使用率(平均值)",
"xpack.infra.hostsViewPage.table.memoryFreeColumnHeader": "可用内存(平均值)",
"xpack.infra.hostsViewPage.table.memoryUsageColumnHeader": "内存使用率(平均值)",
"xpack.infra.hostsViewPage.table.nameColumnHeader": "名称",
Expand All @@ -18808,7 +18806,6 @@
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskIOWrite": "磁盘写入 IOPS",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskReadThroughput": "磁盘读取吞吐量",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceAvailable": "可用磁盘空间",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskSpaceUsed": "磁盘空间使用率",
"xpack.infra.hostsViewPage.tabs.metricsCharts.diskWriteThroughput": "磁盘写入吞吐量",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryFree": "可用内存",
"xpack.infra.hostsViewPage.tabs.metricsCharts.memoryUsage": "内存利用率",
Expand Down

0 comments on commit 241f67b

Please sign in to comment.