@@ -30,6 +30,15 @@ info(stats) -> {member_nodes,transform_partitions([], lists:keysort(1, membership:partitions()))} ]}. +rates(cluster) -> + {obj, [ + {get_rate, lists:foldl(fun(Node, Acc) -> Acc + socket_server:rate(Node, get_rate, 1) end, 0, nodes([this,visible]))}, + {put_rate, lists:foldl(fun(Node, Acc) -> Acc + socket_server:rate(Node, put_rate, 1) end, 0, nodes([this,visible]))}, + {in_rate, lists:foldl(fun(Node, Acc) -> Acc + socket_server:rate(Node, in_rate, 1) end, 0, nodes([this,visible]))}, + {out_rate, lists:foldl(fun(Node, Acc) -> Acc + socket_server:rate(Node, out_rate, 1) end, 0, nodes([this,visible]))}, + {connections, lists:foldl(fun(Node, Acc) -> Acc + socket_server:connections(Node) end, 0, nodes([this,visible]))} + ]}; + rates(Node) -> {obj, [ {get_rate, socket_server:rate(Node, get_rate, 1)}, elibs/web_rpc.erl @@ -4,6 +4,13 @@ <script type="text/javascript" src="/javascripts/domec.js"></script> <script type="text/javascript" src="/javascripts/jquery.timer.js"></script> <script type="text/javascript"> + function decimals(number, value) { + with(Math) { + var coefficient = pow(10, number); + return round(value * coefficient) / coefficient; + } + } + $(document).ready(function(data) { $.getJSON("/rpc/info/stats", function(stats) { $("#node").text(stats.node); @@ -15,6 +22,7 @@ var partitions = node_struct[1]; $.create("a", {'href' : '#'}, "+").click(function() { $("#" + node.split("@").join("at") + "_partitions").toggle("slow"); + return false; }).appendTo($.create("li", {}, node + " ").appendTo("#member_nodes")); var children = $.map(partitions, function(part) { return $.create("li", {}, "" + part); @@ -23,14 +31,24 @@ }); $.timer(1000, function(timer) { $.getJSON("/rpc/rates/" + escape(stats.node), function(rates) { - $("#get_rate").text(rates.get_rate); - $("#put_rate").text(rates.put_rate); - $("#in_rate").text(rates.in_rate); - $("#out_rate").text(rates.out_rate); + $("#get_rate").text(decimals(2, rates.get_rate)); + $("#put_rate").text(decimals(2, rates.put_rate)); + $("#in_rate").text(decimals(2, rates.in_rate / Math.pow(2, 10))); + $("#out_rate").text(decimals(2, rates.out_rate / Math.pow(2, 10))); $("#connections").text(rates.connections); }); timer.reset(1000); }); + $.timer(1000, function(timer) { + $.getJSON("/rpc/rates/cluster", function(rates) { + $("#c_get_rate").text(decimals(2, rates.get_rate)); + $("#c_put_rate").text(decimals(2, rates.put_rate)); + $("#c_in_rate").text(decimals(2, rates.in_rate / Math.pow(2, 10))); + $("#c_out_rate").text(decimals(2, rates.out_rate / Math.pow(2, 10))); + $("#c_connections").text(rates.connections); + }); + timer.reset(1000); + }); }); }); </script> @@ -43,12 +61,17 @@ <ul> <li><span id="get_rate">0.0</span> gets/sec</li> <li><span id="put_rate">0.0</span> puts/sec</li> - <li><span id="out_rate">0.0</span> bytes/sec out</li> - <li><span id="in_rate">0.0</span> bytes/sec in</li> + <li><span id="out_rate">0.0</span> KB/sec out</li> + <li><span id="in_rate">0.0</span> KB/sec in</li> <li><span id="connections">0.0</span> connections</li> </ul> <h3>Cluster Stats</h3> <ul> + <li><span id="c_get_rate">0.0</span> gets/sec</li> + <li><span id="c_put_rate">0.0</span> puts/sec</li> + <li><span id="c_out_rate">0.0</span> KB/sec out</li> + <li><span id="c_in_rate">0.0</span> KB/sec in</li> + <li><span id="c_connections">0.0</span> connections</li> <li>Running Nodes:</li><ul id="running_nodes"></ul> <li>Member Nodes:</li><ul id="member_nodes"></ul> </ul> web/index.html 0eb45eeb7211d33332723352201dd161c7a6d63c 5cf4969409ddb48c2d6a55181dfe15cd852ddb46 Cliff Moon cliff@moonpolysoft.com http://github.com/cliffmoon/dynomite/commit/32f16badf00e3d965c7d39eeb05f281c650e8f1c 32f16badf00e3d965c7d39eeb05f281c650e8f1c 2008-08-28T23:07:19-07:00 2008-08-28T23:07:19-07:00 Merge branch 'master' into powerset a72c2de4369ee8edb4db18fdfc9ede921dd36401 Cliff Moon cliff@moonpolysoft.com