From 4e9b7ef11260c172619854b1e35452e224eb328e Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 4 Mar 2019 20:45:23 +0000 Subject: [PATCH] Minor change to stack monitoring tooltips (#31855) * Minor change to stack monitoring tooltips In the Linux documentation and source code, cgroups are always referred to without capitalization and should be here as well. * Update Jest snapshots * Update more test fixtures --- .../__test__/__snapshots__/handle_response.test.js.snap | 8 ++++---- .../metrics/__test__/__snapshots__/metrics.test.js.snap | 6 +++--- .../server/lib/metrics/elasticsearch/metrics.js | 6 +++--- .../elasticsearch/fixtures/node_detail_advanced.json | 6 +++--- .../elasticsearch/fixtures/nodes_listing_cgroup.json | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap index cb16feaed5ed..c5fc350717a8 100644 --- a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap +++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap @@ -55,7 +55,7 @@ Array [ "node_cgroup_throttled": Object { "metric": Object { "app": "elasticsearch", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.time_throttled_nanos", "format": "0,0.[0]a", "hasCalculation": false, @@ -164,7 +164,7 @@ Array [ "node_cgroup_throttled": Object { "metric": Object { "app": "elasticsearch", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.time_throttled_nanos", "format": "0,0.[0]a", "hasCalculation": false, @@ -334,7 +334,7 @@ Array [ "node_cgroup_throttled": Object { "metric": Object { "app": "elasticsearch", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.time_throttled_nanos", "format": "0,0.[0]a", "hasCalculation": false, @@ -443,7 +443,7 @@ Array [ "node_cgroup_throttled": Object { "metric": Object { "app": "elasticsearch", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.time_throttled_nanos", "format": "0,0.[0]a", "hasCalculation": false, diff --git a/x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap index 37f293b99a26..68e459139623 100644 --- a/x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap +++ b/x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap @@ -3706,7 +3706,7 @@ Object { "node_cgroup_throttled": ElasticsearchMetric { "app": "elasticsearch", "derivative": true, - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.time_throttled_nanos", "format": "0,0.[0]a", "label": "Cgroup Throttling", @@ -3720,7 +3720,7 @@ Object { "node_cgroup_throttled_count": ElasticsearchMetric { "app": "elasticsearch", "derivative": true, - "description": "The number of times that the CPU was throttled by the Cgroup.", + "description": "The number of times that the CPU was throttled by the cgroup.", "field": "node_stats.os.cgroup.cpu.stat.number_of_times_throttled", "format": "0,0.[00]", "label": "Cgroup Throttled Count", @@ -3734,7 +3734,7 @@ Object { "node_cgroup_usage": ElasticsearchMetric { "app": "elasticsearch", "derivative": true, - "description": "The usage, reported in nanoseconds, of the Cgroup. Compare this with the throttling to discover issues.", + "description": "The usage, reported in nanoseconds, of the cgroup. Compare this with the throttling to discover issues.", "field": "node_stats.os.cgroup.cpuacct.usage_nanos", "format": "0,0.[0]a", "label": "Cgroup Usage", diff --git a/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js index 1cf8fd939086..55406a84298b 100644 --- a/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js +++ b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js @@ -670,7 +670,7 @@ export const metrics = { defaultMessage: 'Cgroup Throttling' }), description: i18n.translate('xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupThrottlingDescription', { - defaultMessage: 'The amount of throttled time, reported in nanoseconds, of the Cgroup.' + defaultMessage: 'The amount of throttled time, reported in nanoseconds, of the cgroup.' }), type: 'node', format: LARGE_ABBREVIATED, @@ -685,7 +685,7 @@ export const metrics = { defaultMessage: 'Cgroup Throttled Count' }), description: i18n.translate('xpack.monitoring.metrics.esNode.cgroupCfsStats.cgroupThrottledCountDescription', { - defaultMessage: 'The number of times that the CPU was throttled by the Cgroup.' + defaultMessage: 'The number of times that the CPU was throttled by the cgroup.' }), type: 'node', format: LARGE_FLOAT, @@ -700,7 +700,7 @@ export const metrics = { defaultMessage: 'Cgroup Usage' }), description: i18n.translate('xpack.monitoring.metrics.esNode.cgroupCpuPerformance.cgroupUsageDescription', { - defaultMessage: 'The usage, reported in nanoseconds, of the Cgroup. Compare this with the throttling to discover issues.' + defaultMessage: 'The usage, reported in nanoseconds, of the cgroup. Compare this with the throttling to discover issues.' }), type: 'node', format: LARGE_ABBREVIATED, diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json index acb7ca71f0e2..9e2a6dcd7e3d 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail_advanced.json @@ -1331,7 +1331,7 @@ "metricAgg": "max", "label": "Cgroup Usage", "title": "Cgroup CPU Performance", - "description": "The usage, reported in nanoseconds, of the Cgroup. Compare this with the throttling to discover issues.", + "description": "The usage, reported in nanoseconds, of the cgroup. Compare this with the throttling to discover issues.", "units": "ns", "format": "0,0.[0]a", "hasCalculation": false, @@ -1370,7 +1370,7 @@ "metricAgg": "max", "label": "Cgroup Throttling", "title": "Cgroup CPU Performance", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "units": "ns", "format": "0,0.[0]a", "hasCalculation": false, @@ -1449,7 +1449,7 @@ "metricAgg": "max", "label": "Cgroup Throttled Count", "title": "Cgroup CFS Stats", - "description": "The number of times that the CPU was throttled by the Cgroup.", + "description": "The number of times that the CPU was throttled by the cgroup.", "units": "", "format": "0,0.[00]", "hasCalculation": false, diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/nodes_listing_cgroup.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/nodes_listing_cgroup.json index 7484c62baef2..5b0163ee7363 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/nodes_listing_cgroup.json +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/nodes_listing_cgroup.json @@ -50,7 +50,7 @@ "metricAgg": "max", "label": "Cgroup Throttling", "title": "Cgroup CPU Performance", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "units": "ns", "format": "0,0.[0]a", "hasCalculation": false, @@ -158,7 +158,7 @@ "metricAgg": "max", "label": "Cgroup Throttling", "title": "Cgroup CPU Performance", - "description": "The amount of throttled time, reported in nanoseconds, of the Cgroup.", + "description": "The amount of throttled time, reported in nanoseconds, of the cgroup.", "units": "ns", "format": "0,0.[0]a", "hasCalculation": false,