From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 6 Jul 2009 15:35:38 +0000 (+0200)
Subject: cluster: Added speed field and changes jobs into a nice bar.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce0f70d2db56b6f1cf5c8322c9f750100ca276a9;p=ipfire.org.git

cluster: Added speed field and changes jobs into a nice bar.

There were also some minor fixes like the update interval.
---

diff --git a/www/pages/cluster/__init__.py b/www/pages/cluster/__init__.py
index b74ba63b..d8f787c7 100644
--- a/www/pages/cluster/__init__.py
+++ b/www/pages/cluster/__init__.py
@@ -10,7 +10,7 @@ class Content(web.Content):
 		self.cluster = web.cluster.Cluster("minerva.ipfire.org")
 
 	def __call__(self, lang):
-		ret = "<h3>Cluster Monitoring</h4>"
+		ret = "<h3>Icecream Cluster Monitoring</h4>"
 
 		ret += """<script type="text/javascript">
 				nodes = new Array();
@@ -18,23 +18,27 @@ class Content(web.Content):
 				update = function() {
 					$.getJSON("http://www.ipfire.org/rpc.py", { type: "cluster" },
 						function(data) {
+							var count = 0;
 							$.each(data.nodes, function(i, node) {
-								var nodeid = node.hostname.replace(".", "").replace(".", "");
+								var nodeid = node.hostname.replace(/\./g, "");
+								count++;
 
 								nodes[nodeid] = true;
 
 								if ($("#" + nodeid).length) {
-									$("#" + nodeid + "_jobs").html(node.jobs);
+									$("#" + nodeid + "_speed").html(node.speed);
 								} else {
 									row  = "<tr id=\\"" + nodeid + "\\" class=\\"node\\">";
 									row += "  <td id=\\"" + nodeid + "_hostname\\">" + node.hostname + "</td>";
 									row += "  <td id=\\"" + nodeid + "_arch\\">" + node.arch + "</td>";
 									row += "  <td><span id=\\"" + nodeid + "_loadbar\\"></span></td>";
-									row += "  <td id=\\"" + nodeid + "_jobs\\">" + node.jobs + "</td>";
+									row += "  <td><span id=\\"" + nodeid + "_jobs\\"></span></td>";
+									row += "  <td id=\\"" + nodeid + "_speed\\">" + node.speed + "</td>";
 									row += "</tr>";
 									$("#nodes").append(row);
 								}
 								$("#" + nodeid + "_loadbar").progressBar(node.load, {showText: false});
+								$("#" + nodeid + "_jobs").progressBar(node.jobs.split("/")[0], { max: node.jobs.split("/")[1], textFormat: 'fraction'}); 
 							});
 							$("#loadbar").progressBar(data.cluster.load);
 							for (var nodeid in nodes) {
@@ -45,6 +49,7 @@ class Content(web.Content):
 									nodes[nodeid] = false;
 								}
 							}
+							$("#count").html(count);
 					});
 				}
 
@@ -53,11 +58,11 @@ class Content(web.Content):
 					$("#loadbar").progressBar();
 
 					update();
-					setInterval("update()", 2500);
+					setInterval("update()", 2000);
 				})
 			</script>"""		
 
-		ret += """<p>Cluster's load: <span id="loadbar"></span></p>
+		ret += """<p>Cluster's load: <span id="loadbar"></span>  - Number of nodes: <span id="count">-</span></p>
 				<table id="nodes">
 					<thead>
 						<tr>
@@ -65,6 +70,7 @@ class Content(web.Content):
 							<th>Arch</th>
 							<th>Load</th>
 							<th>Jobs</th>
+							<th>Speed</th>
 						</tr>
 					</thead>
 					<tbody>