From 54d40e36701fb4a06d13521d2c86c64c073d8261 Mon Sep 17 00:00:00 2001
From: cachedout <mike.place@elastic.co>
Date: Tue, 28 Jan 2020 18:28:45 +0000
Subject: [PATCH] =?UTF-8?q?[Stack=20Monitoring]=20Prefer=20units=20if=20th?=
 =?UTF-8?q?ey=20are=20defined=20when=20rende=E2=80=A6=20(#43709)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prefer units if they are defined when rendering cells

* Jest snapshot update

* Lint recommendations

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../nodes/__tests__/__snapshots__/cells.test.js.snap     | 4 ++--
 .../public/components/elasticsearch/nodes/cells.js       | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
index 789e2a5756b4..c7081dc43908 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
@@ -28,12 +28,12 @@ exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
     <div
       class="euiText euiText--extraSmall"
     >
-      206.5 GB max
+      206.5 GB  max
     </div>
     <div
       class="euiText euiText--extraSmall"
     >
-      206.3 GB min
+      206.3 GB  min
     </div>
   </div>
 </div>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/cells.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/cells.js
index fe925b337a31..c5407864e8f8 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/cells.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/cells.js
@@ -21,11 +21,11 @@ const getSlopeArrow = slope => {
   return null;
 };
 
-const metricVal = (metric, format, isPercent) => {
+const metricVal = (metric, format, isPercent, units) => {
   if (isPercent) {
     return formatMetric(metric, format, '%', { prependSpace: false });
   }
-  return formatMetric(metric, format);
+  return formatMetric(metric, format, units);
 };
 
 const noWrapStyle = { overflowX: 'hidden', whiteSpace: 'nowrap' };
@@ -34,6 +34,7 @@ function MetricCell({ isOnline, metric = {}, isPercent, ...props }) {
   if (isOnline) {
     const { lastVal, maxVal, minVal, slope } = get(metric, 'summary', {});
     const format = get(metric, 'metric.format');
+    const units = get(metric, 'metric.units');
 
     return (
       <EuiFlexGroup gutterSize="m" alignItems="center" wrap {...props}>
@@ -49,7 +50,7 @@ function MetricCell({ isOnline, metric = {}, isPercent, ...props }) {
             {i18n.translate('xpack.monitoring.elasticsearch.nodes.cells.maxText', {
               defaultMessage: '{metric} max',
               values: {
-                metric: metricVal(maxVal, format, isPercent),
+                metric: metricVal(maxVal, format, isPercent, units),
               },
             })}
           </EuiText>
@@ -57,7 +58,7 @@ function MetricCell({ isOnline, metric = {}, isPercent, ...props }) {
             {i18n.translate('xpack.monitoring.elasticsearch.nodes.cells.minText', {
               defaultMessage: '{metric} min',
               values: {
-                metric: metricVal(minVal, format, isPercent),
+                metric: metricVal(minVal, format, isPercent, units),
               },
             })}
           </EuiText>