Skip to content

Commit

Permalink
Standarize on 'JVM Heap' phrase for heap metrics (#48093)
Browse files Browse the repository at this point in the history
* Standarize on 'JVM Heap' for heap metrics

* Update tests for JVM Heap label

* Update another test for JVM heap label change
  • Loading branch information
cachedout committed Oct 16, 2019
1 parent ae00c15 commit ee2ea1f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Expand Up @@ -40,7 +40,7 @@ export function ClusterStatus({ stats }) {
},
{
label: i18n.translate('xpack.monitoring.elasticsearch.clusterStatus.memoryLabel', {
defaultMessage: 'Memory'
defaultMessage: 'JVM Heap'
}),
value: formatMetric(memUsed, 'byte') + ' / ' + formatMetric(memMax, 'byte'),
'data-test-subj': 'memory'
Expand Down
Expand Up @@ -206,7 +206,7 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {

cols.push({
name: i18n.translate('xpack.monitoring.elasticsearch.nodes.jvmMemoryColumnTitle', {
defaultMessage: '{javaVirtualMachine} Memory',
defaultMessage: '{javaVirtualMachine} Heap',
values: {
javaVirtualMachine: 'JVM'
}
Expand Down
Expand Up @@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }) {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n1',
indicesCount: 'Indices\n19',
memory: 'Memory\n267.7 MB / 676.8 MB',
memory: 'JVM Heap\n267.7 MB / 676.8 MB',
totalShards: 'Total shards\n46',
unassignedShards: 'Unassigned shards\n23',
documentCount: 'Documents\n4,535',
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
Expand Up @@ -38,7 +38,7 @@ export default function ({ getService, getPageObjects }) {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n2',
indicesCount: 'Indices\n20',
memory: 'Memory\n696.6 MB / 1.3 GB',
memory: 'JVM Heap\n696.6 MB / 1.3 GB',
totalShards: 'Total shards\n79',
unassignedShards: 'Unassigned shards\n7',
documentCount: 'Documents\n25,758',
Expand Down Expand Up @@ -213,7 +213,7 @@ export default function ({ getService, getPageObjects }) {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n3',
indicesCount: 'Indices\n20',
memory: 'Memory\n575.3 MB / 2.0 GB',
memory: 'JVM Heap\n575.3 MB / 2.0 GB',
totalShards: 'Total shards\n80',
unassignedShards: 'Unassigned shards\n5',
documentCount: 'Documents\n25,927',
Expand Down
Expand Up @@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }) {
expect(await esClusterSummaryStatus.getContent()).to.eql({
nodesCount: 'Nodes\n3',
indicesCount: 'Indices\n20',
memory: 'Memory\n575.3 MB / 2.0 GB',
memory: 'JVM Heap\n575.3 MB / 2.0 GB',
totalShards: 'Total shards\n80',
unassignedShards: 'Unassigned shards\n5',
documentCount: 'Documents\n25,927',
Expand Down

0 comments on commit ee2ea1f

Please sign in to comment.