Repository: incubator-blur Updated Branches: refs/heads/master a68cb49eb -> 177d09795
Fixed BLUR-414 BLUR-415 Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/177d0979 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/177d0979 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/177d0979 Branch: refs/heads/master Commit: 177d097950e71ddd0d46ec958cb666af4133f307 Parents: a68cb49 Author: Aaron McCurry <[email protected]> Authored: Mon Mar 16 08:51:37 2015 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Mar 16 08:51:37 2015 -0400 ---------------------------------------------------------------------- .../src/main/resources/webapp/metrics.html | 36 ++++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/177d0979/blur-status/src/main/resources/webapp/metrics.html ---------------------------------------------------------------------- diff --git a/blur-status/src/main/resources/webapp/metrics.html b/blur-status/src/main/resources/webapp/metrics.html index d4f02d9..13d97f0 100644 --- a/blur-status/src/main/resources/webapp/metrics.html +++ b/blur-status/src/main/resources/webapp/metrics.html @@ -29,11 +29,10 @@ under the License. <script src="js/Blur.js"></script> <script src="js/Blur_types.js"></script> <script> +var transport = new Thrift.Transport("/blur"); +var protocol = new Thrift.Protocol(transport); +var client = new BlurClient(protocol); function displayPage() { - var transport = new Thrift.Transport("/blur"); - var protocol = new Thrift.Protocol(transport); - var client = new BlurClient(protocol); - try { var metrics = client.metrics(null); var body = $("#page_body"); @@ -45,9 +44,9 @@ function displayPage() { var key = keys[i]; var metric = metrics[key]; s += "<tr><td>"+key+"</td><td>"; - s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.strMap,false) + "</table>"; - s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.longMap,false) + "</table>"; - s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.doubleMap,true) + "</table>"; + s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.strMap,false,false) + "</table>"; + s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.longMap,true,false) + "</table>"; + s += "<table border=1 class=\"table-bordered table-striped table-condensed\">" + writeValueMap(metrics,key,metric.doubleMap,true,true) + "</table>"; s += "</td></tr>"; } s += "</table>"; @@ -57,7 +56,7 @@ function displayPage() { } setTimeout(displayPage,3000); } -function writeValueMap(metrics,key,map,formatNumber) { +function writeValueMap(metrics,key,map,isNumber,formatNumber) { if (map) { var s = "<tr>"; var keys = Object.keys(map).sort(); @@ -68,10 +67,14 @@ function writeValueMap(metrics,key,map,formatNumber) { s += "</tr><tr>"; for (var i = 0; i < keys.length; i++) { var key = keys[i]; - if (formatNumber) { - s += "<td>"+map[key].toPrecision(6)+"</td>"; + if (isNumber) { + if (formatNumber) { + s += "<td>"+addCommas(map[key].toFixed(3))+"</td>"; + } else { + s += "<td>"+addCommas(map[key])+"</td>"; + } } else { - s += "<td>"+map[key]+"</td>"; + s += "<td>"+map[key]+"</td>"; } } s += "</tr>"; @@ -79,6 +82,17 @@ function writeValueMap(metrics,key,map,formatNumber) { } return ""; } +function addCommas(numberStr) { + numberStr += ''; + var numb = numberStr.split('.'); + var greaterThan1 = numb[0]; + var lessThan1 = numb.length > 1 ? '.' + numb[1] : ''; + var regex = /(\d+)(\d{3})/; + while (regex.test(greaterThan1)) { + greaterThan1 = greaterThan1.replace(regex, '$1' + ',' + '$2'); + } + return greaterThan1 + lessThan1; +} $(window).bind("load", displayPage); </script> <body>
