Merge pull request #1022 from spadgett/metrics-cpu-cores

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/directives/deploymentMetrics.js

@@ -62,7 +62,8 @@ angular.module('openshiftConsole')
           chartID: "memory-" + scope.uniqueID
         }, {
           label: "CPU",
-          units: "millicores",
+          units: "cores",
+          convert: ConversionService.millicoresToCores,
           descriptor: 'cpu/usage_rate',
           type: 'pod_container',
           chartID: "cpu-" + scope.uniqueID

Diff for: app/scripts/directives/podMetrics.js

@@ -57,9 +57,11 @@ angular.module('openshiftConsole')
         if (_.includes(scope.includedMetrics, "cpu")) {
           scope.metrics.push({
             label: "CPU",
-            units: "millicores",
+            units: "cores",
             chartPrefix: "cpu-",
-            convert: _.round,
+            convert: ConversionService.millicoresToCores,
+            // Max number of decimal places to show for usage donut.
+            usagePrecision: 3,
             containerMetric: true,
             datasets: [
               {
@@ -134,7 +136,12 @@ angular.module('openshiftConsole')
 
         var createSparklineConfig = function(metric) {
           var chartID = metric.chartPrefix + scope.uniqueID + '-sparkline';
-          return MetricsCharts.getDefaultSparklineConfig(chartID, metric.units);
+          var config = MetricsCharts.getDefaultSparklineConfig(chartID, metric.units);
+          if (metric.datasets.length === 1) {
+            _.set(config, 'legend.show', false);
+          }
+
+          return config;
         };
 
         function getLimit(metricID) {
@@ -154,8 +161,7 @@ angular.module('openshiftConsole')
           case 'cpu/usage_rate':
             var cpuLimit = getCPULimit(container);
             if (cpuLimit) {
-              // Convert cores to millicores.
-              return _.round(usageValueFilter(cpuLimit) * 1000);
+              return usageValueFilter(cpuLimit);
             }
             break;
           }
@@ -354,9 +360,9 @@ angular.module('openshiftConsole')
             currentUsage = metric.convert(currentUsage);
           }
 
-          dataset.used = _.round(currentUsage);
+          dataset.used = d3.round(currentUsage, metric.usagePrecision);
           if (dataset.total) {
-            dataset.available = _.round(dataset.total - currentUsage);
+            dataset.available = d3.round(dataset.total - currentUsage, metric.usagePrecision);
           }
           metric.totalUsed += dataset.used;
         }

Diff for: app/scripts/services/convert.js

@@ -15,12 +15,20 @@ angular.module("openshiftConsole")
         return value;
       }
 
-      // Round to one decimal place
       return value / 1024;
     };
 
+    var millicoresToCores = function(value) {
+      if (!value) {
+        return value;
+      }
+
+      return value / 1000;
+    };
+
     return {
       bytesToMiB: bytesToMiB,
-      bytesToKiB: bytesToKiB
+      bytesToKiB: bytesToKiB,
+      millicoresToCores: millicoresToCores
     };
   });

Diff for: app/scripts/services/metricsCharts.js

@@ -11,6 +11,8 @@ angular.module("openshiftConsole")
       switch (metricID) {
       case 'memory/usage':
         return _.round(ConversionService.bytesToMiB(point.value), 2);
+      case 'cpu/usage_rate':
+        return ConversionService.millicoresToCores(point.value);
       case 'network/rx_rate':
       case 'network/tx_rate':
         return _.round(ConversionService.bytesToKiB(point.value), 2);
@@ -80,11 +82,6 @@ angular.module("openshiftConsole")
                 left: 0,
                 top: 20,
                 bottom: 0
-              },
-              tick: {
-                format: function(value) {
-                  return d3.round(value, 3);
-                }
               }
             }
           },
@@ -97,7 +94,8 @@ angular.module("openshiftConsole")
           tooltip: {
             format: {
               value: function(value) {
-                return d3.round(value, 2) + " " + units;
+                var precision = units === 'cores' ? 3 : 2;
+                return d3.round(value, precision) + " " + units;
               }
             },
           }
@@ -126,7 +124,7 @@ angular.module("openshiftConsole")
       },
 
       formatUsage: function(usage) {
-        if (usage < 0.01) {
+        if (usage < 0.001) {
           return '0';
         }
 

Diff for: dist/scripts/scripts.js

@@ -3051,6 +3051,9 @@ switch (c) {
 case "memory/usage":
 return _.round(b.bytesToMiB(a.value), 2);
 
+case "cpu/usage_rate":
+return b.millicoresToCores(a.value);
+
 case "network/rx_rate":
 case "network/tx_rate":
 return _.round(b.bytesToKiB(a.value), 2);
@@ -3113,11 +3116,6 @@ padding:{
 left:0,
 top:20,
 bottom:0
-},
-tick:{
-format:function(a) {
-return d3.round(a, 3);
-}
 }
 }
 },
@@ -3130,7 +3128,8 @@ height:c ? 35 :175
 tooltip:{
 format:{
 value:function(a) {
-return d3.round(a, 2) + " " + b;
+var c = "cores" === b ? 3 :2;
+return d3.round(a, c) + " " + b;
 }
 }
 }
@@ -3150,7 +3149,7 @@ b.push(a.start), f[d].push(e);
 }), e.columns = [ b ].concat(_.values(f)), e;
 },
 formatUsage:function(a) {
-return a < .01 ? "0" :a < 1 ? d3.format(".1r")(a) :d3.format(".2r")(a);
+return a < .001 ? "0" :a < 1 ? d3.format(".1r")(a) :d3.format(".2r")(a);
 },
 redraw:function(b) {
 a(function() {
@@ -3777,10 +3776,13 @@ var a = function(a) {
 return a ? a / 1048576 :a;
 }, b = function(a) {
 return a ? a / 1024 :a;
+}, c = function(a) {
+return a ? a / 1e3 :a;
 };
 return {
 bytesToMiB:a,
-bytesToKiB:b
+bytesToKiB:b,
+millicoresToCores:c
 };
 }), angular.module("openshiftConsole").service("BreadcrumbsService", [ "$filter", "APIService", "Navigate", function(a, b, c) {
 var d = a("annotation"), e = a("displayName"), f = function(a) {
@@ -11102,7 +11104,7 @@ break;
 
 case "cpu/usage_rate":
 var d = D(b);
-if (d) return _.round(1e3 * k(d));
+if (d) return k(d);
 }
 return null;
 }
@@ -11192,7 +11194,7 @@ return !(l.metricsError || J > 1) && (l.pod && _.get(l, "options.selectedContain
 function w(a, b, c) {
 b.total = m(b.id), b.total && (l.hasLimits = !0);
 var d = _.get(c, "usage.value");
-isNaN(d) && (d = 0), a.convert && (d = a.convert(d)), b.used = _.round(d), b.total && (b.available = _.round(b.total - d)), a.totalUsed += b.used;
+isNaN(d) && (d = 0), a.convert && (d = a.convert(d)), b.used = d3.round(d, a.usagePrecision), b.total && (b.available = d3.round(b.total - d, a.usagePrecision)), a.totalUsed += b.used;
 }
 function x(a, b) {
 l.noData = !1;
@@ -11244,9 +11246,10 @@ data:[]
 } ]
 }), _.includes(l.includedMetrics, "cpu") && l.metrics.push({
 label:"CPU",
-units:"millicores",
+units:"cores",
 chartPrefix:"cpu-",
-convert:_.round,
+convert:h.millicoresToCores,
+usagePrecision:3,
 containerMetric:!0,
 datasets:[ {
 id:"cpu/usage_rate",
@@ -11295,8 +11298,8 @@ widht:175
 }
 };
 }, I = function(a) {
-var b = a.chartPrefix + l.uniqueID + "-sparkline";
-return i.getDefaultSparklineConfig(b, a.units);
+var b = a.chartPrefix + l.uniqueID + "-sparkline", c = i.getDefaultSparklineConfig(b, a.units);
+return 1 === a.datasets.length && _.set(c, "legend.show", !1), c;
 }, J = 0;
 l.$watch("options", function() {
 _.each(l.metrics, function(a) {
@@ -11453,7 +11456,8 @@ type:"pod_container",
 chartID:"memory-" + b.uniqueID
 }, {
 label:"CPU",
-units:"millicores",
+units:"cores",
+convert:g.millicoresToCores,
 descriptor:"cpu/usage_rate",
 type:"pod_container",
 chartID:"cpu-" + b.uniqueID