Merge pull request openshift#553 from spadgett/metrics-fix

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/deploymentMetrics.js

@@ -231,7 +231,9 @@ angular.module('openshiftConsole')
             values.push(metric.convert ? metric.convert(avg) : avg);
           });
 
-          metric.lastValue = _.last(values) || 0;
+          if (values.length > 1) {
+            metric.lastValue = _.last(values) || 0;
+          }
 
           return columns;
         }
@@ -310,7 +312,9 @@ angular.module('openshiftConsole')
             var descriptor = metric.descriptor;
             if (scope.compact && metric.compactCombineWith) {
               descriptor = metric.compactCombineWith;
-              metricByID[descriptor].lastValue += metric.lastValue;
+              if (metric.lastValue) {
+                metricByID[descriptor].lastValue = (metricByID[descriptor].lastValue || 0) + metric.lastValue;
+              }
             }
 
             if (!chartByMetric[descriptor]) {

dist/scripts/scripts.js

@@ -8425,7 +8425,7 @@ var b = i(a);
 }), _.each(e, function(b, c) {
 var d;
 d = b.count ? b.total / b.count :null, f.push(Number(c)), g.push(a.convert ? a.convert(d) :d);
-}), a.lastValue = _.last(g) || 0, h;
+}), g.length > 1 && (a.lastValue = _.last(g) || 0), h;
 }
 function i(a, c) {
 var e = [], g = {
@@ -8451,7 +8451,7 @@ return a[0];
 function j(a) {
 w || (b.loaded = !0, b.showAverage = _.size(b.pods) > 5 || b.compact, _.each(b.metrics, function(c) {
 var d, e = i(a, c), f = c.descriptor;
-b.compact && c.compactCombineWith && (f = c.compactCombineWith, B[f].lastValue += c.lastValue), t[f] ? (t[f].load(e), b.showAverage ? t[f].legend.hide() :t[f].legend.show()) :(d = C(c), d.data = e, t[f] = c3.generate(d));
+b.compact && c.compactCombineWith && (f = c.compactCombineWith, c.lastValue && (B[f].lastValue = (B[f].lastValue || 0) + c.lastValue)), t[f] ? (t[f].load(e), b.showAverage ? t[f].legend.hide() :t[f].legend.show()) :(d = C(c), d.data = e, t[f] = c3.generate(d));
 }));
 }
 function k() {