Merge pull request #57 from benjchristensen/dashboard-js-fix

Dashboard js fix
Netflix · Dec 21, 2012 · 40bb191 · 40bb191
2 parents 646bf0d + 28c179e
commit 40bb191
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/hystrix-dashboard/src/main/webapp/components/hystrixCommand/hystrixCommand.js b/hystrix-dashboard/src/main/webapp/components/hystrixCommand/hystrixCommand.js
@@ -87,6 +87,9 @@
 		 */
 		function preProcessData(data) {
 			validateData(data);
+			// clean up the 'name' field so it doesn't have invalid characters
+			data.name = data.name.replace(/[.:-]/g,'_');
+			// do math
 			converAllAvg(data);
 			calcRatePerSecond(data);
 		}

diff --git a/...ashboard/src/main/webapp/components/hystrixCommand/templates/hystrixCircuitContainer.html b/...ashboard/src/main/webapp/components/hystrixCommand/templates/hystrixCircuitContainer.html
@@ -4,6 +4,9 @@
 		if(displayName.substring(0, 36) == 'APIDependencyCommand_CircuitBreaker_') {
 			displayName = displayName.substring(36, displayName.length);
 		}
+		if(displayName.length > 32) {
+			displayName = displayName.substring(0,4) + "..." + displayName.substring(displayName.length-20, displayName.length);
+		}
 	%>
 
 	<div id="chart_CIRCUIT_<%= name %>" class="chart" style="position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"></div>