Merge pull request #1447 from yaacov/units-ad-hoc

Check for base unit when adjusting unit label (cherry picked from commit e2865c1) https://bugzilla.redhat.com/show_bug.cgi?id=1478379
ManageIQ · Aug 4, 2017 · 820ad5e · 820ad5e
1 parent 10ea79f
commit 820ad5e
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 13 deletions.
diff --git a/app/assets/javascripts/controllers/live_metrics/ad_hoc_metrics_controller.js b/app/assets/javascripts/controllers/live_metrics/ad_hoc_metrics_controller.js
@@ -10,6 +10,7 @@ ManageIQ.angular.app.controller('adHocMetricsController', ['$http', '$window', '
     dash.refreshList = httpUtils.refreshList;
     dash.refreshGraph = httpUtils.refreshGraph;
     dash.setFilterOptions = utils.setFilterOptions;
+    dash.metricPrefix = utils.metricPrefix;
     dash.setPage = httpUtils.setPage;
 
     var pageSetup = function() {

diff --git a/app/assets/javascripts/controllers/live_metrics/util/metrics-utils-factory.js b/app/assets/javascripts/controllers/live_metrics/util/metrics-utils-factory.js
@@ -102,17 +102,43 @@ angular.module('miq.util').factory('metricsUtilsFactory', function() {
         data[0].value.toFixed(2) + '</div>';
     };
 
-    var metricPrefix = function(maxValue) {
-      var exp = parseInt(Math.log10(maxValue) / 3, 10) * 3;
-      var metricPrefixes = {
-        3: {prefix: 'k', divisor: Math.pow(10, 3)},
-        6: {prefix: 'M', divisor: Math.pow(10, 6)},
-        9: {prefix: 'G', divisor: Math.pow(10, 9)},
-        12: {prefix: 'T', divisor: Math.pow(10, 12)},
-        15: {prefix: 'P', divisor: Math.pow(10, 15)}
+    var metricPrefix = function(maxValue, units) {
+      var metricPrefixes;
+      var baseUnit;
+      var baseUnitMultiplier;
+      var baseUnitMaxValue;
+      var exp;
+
+      // get base unit for special case units
+      switch (units) {
+        case 'millisecond':
+        case 'ms':
+          baseUnitMultiplier = Math.pow(10, -3);
+          baseUnit = 's';
+          break;
+        case 'ns':
+          baseUnitMultiplier = Math.pow(10, -9);
+          baseUnit = 's';
+          break;
+        default:
+          baseUnitMultiplier = 1;
+          baseUnit = units;
+      }
+
+      // adjust to base units and calc exponent
+      baseUnitMaxValue = maxValue * baseUnitMultiplier;
+      exp = ~~(Math.log10(baseUnitMaxValue) / 3) * 3;
+
+      // calc output unit label and multiplier
+      metricPrefixes = {
+        3: {unitLabel: 'K' + baseUnit, multiplier: baseUnitMultiplier * Math.pow(10, -3)},
+        6: {unitLabel: 'M' + baseUnit, multiplier: baseUnitMultiplier * Math.pow(10, -6)},
+        9: {unitLabel: 'G' + baseUnit, multiplier: baseUnitMultiplier * Math.pow(10, -9)},
+        12: {unitLabel: 'T' + baseUnit, multiplier: baseUnitMultiplier * Math.pow(10, -12)},
+        15: {unitLabel: 'P' + baseUnit, multiplier: baseUnitMultiplier * Math.pow(10, -15)}
       };
 
-      return metricPrefixes[exp] || {prefix: '', divisor: 1};
+      return metricPrefixes[exp] || {unitLabel: baseUnit, multiplier: baseUnitMultiplier};
     };
 
     var getContainerDashboardData = function(item) {
@@ -124,11 +150,11 @@ angular.module('miq.util').factory('metricsUtilsFactory', function() {
 
       item.data = item.data.sort(function(a, b) { return a.timestamp > b.timestamp; });
       var maxValue = Math.max.apply(Math, item.data.map(function(o) { return o.value; }))
-      var m = metricPrefix(maxValue);
+      var m = metricPrefix(maxValue, item.tags.units || '');
 
       var id = _.uniqueId('ChartId_');
       var label = item.tags.descriptor_name || item.id;
-      var units = m.prefix + (item.tags.units || '');
+      var units = m.unitLabel;
 
       item.lastValues = {
         total: '100',
@@ -137,7 +163,7 @@ angular.module('miq.util').factory('metricsUtilsFactory', function() {
       };
       angular.forEach(item.data, function(d) {
         item.lastValues.xData.push(new Date(d.timestamp));
-        item.lastValues.yData.push((d.value / m.divisor).toFixed(2));
+        item.lastValues.yData.push((d.value * m.multiplier).toFixed(2));
       });
       item.lastValue = '' + item.lastValues.yData[item.data.length] + ' ' + units
 
@@ -156,7 +182,8 @@ angular.module('miq.util').factory('metricsUtilsFactory', function() {
       getContainerParamsData: getContainerParamsData,
       getContainerDashboardData: getContainerDashboardData,
       checkResponse: checkResponse,
-      setFilterOptions: setFilterOptions
+      setFilterOptions: setFilterOptions,
+      metricPrefix: metricPrefix
     }
   }
 });
diff --git a/...ascripts/controllers/container_live_dashboard/container_live_dashboard_controller_spec.js b/...ascripts/controllers/container_live_dashboard/container_live_dashboard_controller_spec.js
@@ -52,4 +52,22 @@ describe('adHocMetricsController', function() {
       expect($controller.timeFilter.range_count).toBe(9);
     });
   });
+
+  describe('utility functions', function() {
+    it('should calculate units correctly', function() {
+      var m;
+
+      m = $controller.metricPrefix(10000, 'ms');
+      expect(m.multiplier).toBe(Math.pow(10, -3));
+      expect(m.unitLable).toBe('s');
+
+      m = $controller.metricPrefix(10000, 'ns');
+      expect(m.multiplier).toBe(Math.pow(10, -9));
+      expect(m.unitLable).toBe('s');
+
+      m = $controller.metricPrefix(10000, 's');
+      expect(m.multiplier).toBe(Math.pow(10, -3));
+      expect(m.unitLable).toBe('Ks');
+    });
+  });
 });