Upgrade to Hystrix 1.4.13

pom.xml

@@ -27,7 +27,7 @@
 		<archaius.version>0.6.5</archaius.version>
 		<eureka.version>1.1.147</eureka.version>
 		<feign.version>8.6.0</feign.version>
-		<hystrix.version>1.4.10</hystrix.version>
+		<hystrix.version>1.4.13</hystrix.version>
 		<ribbon.version>2.0.0</ribbon.version>
 		<zuul.version>1.0.28</zuul.version>
 		<rxjava.version>1.0.11</rxjava.version>

spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.css

@@ -110,7 +110,7 @@
 
 .dependencies div.monitor {
 	width: 245px; /* we want a fixed width instead of percentage as I want the boxes to be a set size and then fill in as many as can fit in each row ... this allows 3 columns on an iPad */
-	height: 150px;
+	height: 155px;
 }
 
 .dependencies .success {

spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.js

@@ -86,14 +86,23 @@
 		 * e.g   Get Averages from sums, do rate calculation etc.
 		 */
 		function preProcessData(data) {
+			// set defaults for values that may be missing from older streams
+			setIfMissing(data, "rollingCountBadRequests", 0);
+			// assert all the values we need
 			validateData(data);
 			// escape string used in jQuery & d3 selectors
 			data.escapedName = data.name.replace(/([ !"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g,'\\$1');
 			// do math
-			converAllAvg(data);
+			convertAllAvg(data);
 			calcRatePerSecond(data);
 		}
 
+		function setIfMissing(data, key, defaultValue) {
+			if(data[key] == undefined) {
+				data[key] = defaultValue;
+			}
+		}
+
 		/**
 		 * Since the stream of data can be aggregated from multiple hosts in a tiered manner
 		 * the aggregation just sums everything together and provides us the denominator (reportingHosts)
@@ -101,7 +110,7 @@
 		 *
 		 * We want to do this on any numerical values where we want per instance rather than cluster-wide sum.
 		 */
-		function converAllAvg(data) {
+		function convertAllAvg(data) {
 			convertAvg(data, "errorPercentage", true);
 			convertAvg(data, "latencyExecute_mean", false);
 			convertAvg(data, "latencyTotal_mean", false);
@@ -159,6 +168,7 @@
             assertNotNull(data,"rollingCountSuccess");
             assertNotNull(data,"rollingCountThreadPoolRejected");
             assertNotNull(data,"rollingCountTimeout");
+            assertNotNull(data,"rollingCountBadRequests");
             assertNotNull(data,"currentConcurrentExecutionCount");
             assertNotNull(data,"latencyExecute_mean");
             assertNotNull(data,"latencyExecute");

spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/templates/hystrixCircuitContainer.html

@@ -9,7 +9,7 @@
 	%>
 	
 	<div id="chart_CIRCUIT_<%= name %>" class="chart" style="position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"></div>
-    <div style="position:absolute;top:0x;width:100%;height:15px;opacity:0.8; background:white;">
+    <div style="position:absolute;top:0;width:100%;height:15px;opacity:0.8; background:white;">
     	<% if(includeDetailIcon) { %>
     	<p class="name" <%= toolTip %> style="padding-right:16px">
     		<%= displayName %>

spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixThreadPool/templates/hystrixThreadPoolContainer.html

@@ -10,7 +10,7 @@
 	%>
 	
 	<div id="chart_THREAD_POOL_<%= name %>" class="chart" style="position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"></div>
-	<div style="position:absolute;top:0x;width:100%;height:15px;opacity:0.8; background:white;"><p class="name" <%= toolTip %>><%= displayName %></p></div>
+	<div style="position:absolute;top:0;width:100%;height:15px;opacity:0.8; background:white;"><p class="name" <%= toolTip %>><%= displayName %></p></div>
 	<div style="position:absolute;top:15px;; opacity:0.8; background:white; width:100%; height:95%;">
 		<div class="monitor_data"></div>
 	</div>

spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl

@@ -61,7 +61,6 @@
 		<div id="dependencies" class="row dependencies"><span class="loading">Loading ...</span></div>
 		
 		<div class="spacer"></div>
-		<div class="spacer"></div>
 
 		<div class="row">
 			<div class="menubar">