Skip to content

Commit 6eb4e6b

Browse files
simianhackersimianhacker
committed
[Metrics UI] Enhance Inventory View Tooltips
1 parent 5236335 commit 6eb4e6b

32 files changed

Lines changed: 834 additions & 278 deletions

File tree

‎x-pack/plugins/infra/common/http_api/snapshot_api.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const SnapshotNodeMetricRT = rt.intersection([
3434
SnapshotNodeMetricOptionalRT,
3535
]);
3636
export const SnapshotNodeRT = rt.type({
37-
metric: SnapshotNodeMetricRT,
37+
metrics: rt.array(SnapshotNodeMetricRT),
3838
path: rt.array(SnapshotNodePathRT),
3939
});
4040

@@ -97,7 +97,7 @@ export const SnapshotMetricInputRT = rt.union([
9797
export const SnapshotRequestRT = rt.intersection([
9898
rt.type({
9999
timerange: InfraTimerangeInputRT,
100-
metric: SnapshotMetricInputRT,
100+
metrics: rt.array(SnapshotMetricInputRT),
101101
groupBy: SnapshotGroupByRT,
102102
nodeType: ItemTypeRT,
103103
sourceId: rt.string,

‎x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ export const awsEC2: InventoryModel = {
3030
ip: 'aws.ec2.instance.public.ip',
3131
},
3232
requiredMetrics: ['awsEC2CpuUtilization', 'awsEC2NetworkTraffic', 'awsEC2DiskIOBytes'],
33+
tooltipMetrics: ['cpu', 'rx', 'tx'],
3334
};

‎x-pack/plugins/infra/common/inventory_models/aws_rds/index.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ export const awsRDS: InventoryModel = {
3535
'awsRDSActiveTransactions',
3636
'awsRDSLatency',
3737
],
38+
tooltipMetrics: [
39+
'cpu',
40+
'rdsLatency',
41+
'rdsConnections',
42+
'rdsQueriesExecuted',
43+
'rdsActiveTransactions',
44+
],
3845
};

‎x-pack/plugins/infra/common/inventory_models/aws_s3/index.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ export const awsS3: InventoryModel = {
3535
'awsS3DownloadBytes',
3636
'awsS3UploadBytes',
3737
],
38+
tooltipMetrics: [
39+
's3BucketSize',
40+
's3NumberOfObjects',
41+
's3TotalRequests',
42+
's3UploadBytes',
43+
's3DownloadBytes',
44+
],
3845
};

‎x-pack/plugins/infra/common/inventory_models/aws_sqs/index.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ export const awsSQS: InventoryModel = {
3535
'awsSQSMessagesEmpty',
3636
'awsSQSOldestMessage',
3737
],
38+
tooltipMetrics: [
39+
'sqsMessagesVisible',
40+
'sqsMessagesDelayed',
41+
'sqsMessagesEmpty',
42+
'sqsMessagesSent',
43+
'sqsOldestMessage',
44+
],
3845
};

‎x-pack/plugins/infra/common/inventory_models/container/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ export const container: InventoryModel = {
3737
'containerDiskIOBytes',
3838
'containerDiskIOOps',
3939
],
40+
tooltipMetrics: ['cpu', 'memory', 'rx', 'tx'],
4041
};

‎x-pack/plugins/infra/common/inventory_models/host/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ export const host: InventoryModel = {
4747
...awsRequiredMetrics,
4848
...nginxRequireMetrics,
4949
],
50+
tooltipMetrics: ['cpu', 'memory', 'tx', 'rx'],
5051
};

‎x-pack/plugins/infra/common/inventory_models/intl_strings.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
import { i18n } from '@kbn/i18n';
8+
import { SnapshotMetricType } from './types';
89
export const CPUUsage = i18n.translate('xpack.infra.waffle.metricOptions.cpuUsageText', {
910
defaultMessage: 'CPU usage',
1011
});
@@ -68,3 +69,81 @@ export const fieldToName = (field: string) => {
6869
};
6970
return LOOKUP[field] || field;
7071
};
72+
73+
export const SNAPSHOT_METRIC_TRANSLATIONS = {
74+
cpu: i18n.translate('xpack.infra.waffle.metricOptions.cpuUsageText', {
75+
defaultMessage: 'CPU usage',
76+
}),
77+
78+
memory: i18n.translate('xpack.infra.waffle.metricOptions.memoryUsageText', {
79+
defaultMessage: 'Memory usage',
80+
}),
81+
82+
rx: i18n.translate('xpack.infra.waffle.metricOptions.inboundTrafficText', {
83+
defaultMessage: 'Inbound traffic',
84+
}),
85+
86+
tx: i18n.translate('xpack.infra.waffle.metricOptions.outboundTrafficText', {
87+
defaultMessage: 'Outbound traffic',
88+
}),
89+
90+
logRate: i18n.translate('xpack.infra.waffle.metricOptions.hostLogRateText', {
91+
defaultMessage: 'Log rate',
92+
}),
93+
94+
load: i18n.translate('xpack.infra.waffle.metricOptions.loadText', {
95+
defaultMessage: 'Load',
96+
}),
97+
98+
count: i18n.translate('xpack.infra.waffle.metricOptions.countText', {
99+
defaultMessage: 'Count',
100+
}),
101+
diskIOReadBytes: i18n.translate('xpack.infra.waffle.metricOptions.diskIOReadBytes', {
102+
defaultMessage: 'Disk Reads',
103+
}),
104+
diskIOWriteBytes: i18n.translate('xpack.infra.waffle.metricOptions.diskIOWriteBytes', {
105+
defaultMessage: 'Disk Writes',
106+
}),
107+
s3BucketSize: i18n.translate('xpack.infra.waffle.metricOptions.s3BucketSize', {
108+
defaultMessage: 'Bucket Size',
109+
}),
110+
s3TotalRequests: i18n.translate('xpack.infra.waffle.metricOptions.s3TotalRequests', {
111+
defaultMessage: 'Total Requests',
112+
}),
113+
s3NumberOfObjects: i18n.translate('xpack.infra.waffle.metricOptions.s3NumberOfObjects', {
114+
defaultMessage: 'Number of Objects',
115+
}),
116+
s3DownloadBytes: i18n.translate('xpack.infra.waffle.metricOptions.s3DownloadBytes', {
117+
defaultMessage: 'Downloads (Bytes)',
118+
}),
119+
s3UploadBytes: i18n.translate('xpack.infra.waffle.metricOptions.s3UploadBytes', {
120+
defaultMessage: 'Uploads (Bytes)',
121+
}),
122+
rdsConnections: i18n.translate('xpack.infra.waffle.metricOptions.rdsConnections', {
123+
defaultMessage: 'Connections',
124+
}),
125+
rdsQueriesExecuted: i18n.translate('xpack.infra.waffle.metricOptions.rdsQueriesExecuted', {
126+
defaultMessage: 'Queries Executed',
127+
}),
128+
rdsActiveTransactions: i18n.translate('xpack.infra.waffle.metricOptions.rdsActiveTransactions', {
129+
defaultMessage: 'Active Transactions',
130+
}),
131+
rdsLatency: i18n.translate('xpack.infra.waffle.metricOptions.rdsLatency', {
132+
defaultMessage: 'Latency',
133+
}),
134+
sqsMessagesVisible: i18n.translate('xpack.infra.waffle.metricOptions.sqsMessagesVisible', {
135+
defaultMessage: 'Messages Available',
136+
}),
137+
sqsMessagesDelayed: i18n.translate('xpack.infra.waffle.metricOptions.sqsMessagesDelayed', {
138+
defaultMessage: 'Messages Delayed',
139+
}),
140+
sqsMessagesSent: i18n.translate('xpack.infra.waffle.metricOptions.sqsMessagesSent', {
141+
defaultMessage: 'Messages Added',
142+
}),
143+
sqsMessagesEmpty: i18n.translate('xpack.infra.waffle.metricOptions.sqsMessagesEmpty', {
144+
defaultMessage: 'Messages Returned Empty',
145+
}),
146+
sqsOldestMessage: i18n.translate('xpack.infra.waffle.metricOptions.sqsOldestMessage', {
147+
defaultMessage: 'Oldest Message',
148+
}),
149+
} as Record<SnapshotMetricType, string>;

‎x-pack/plugins/infra/common/inventory_models/pod/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ export const pod: InventoryModel = {
3737
'podNetworkTraffic',
3838
...nginxRequiredMetrics,
3939
],
40+
tooltipMetrics: ['cpu', 'memory', 'rx', 'tx'],
4041
};

‎x-pack/plugins/infra/common/inventory_models/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,5 @@ export interface InventoryModel {
351351
};
352352
metrics: InventoryMetrics;
353353
requiredMetrics: InventoryMetric[];
354+
tooltipMetrics: SnapshotMetricType[];
354355
}

0 commit comments

Comments
 (0)