[rhmessaging-commits] rhmessaging commits: r2991 - mgmt/trunk/cumin/python/cumin.
Author: eallen
Date: 2008-12-12 11:40:01 -0500 (Fri, 12 Dec 2008)
New Revision: 2991
Modified:
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/system.py
mgmt/trunk/cumin/python/cumin/system.strings
Log:
Added charts to system statistics page for sysimage memFree and loadAverage1Min
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-12-12 16:40:01 UTC (rev 2991)
@@ -647,6 +647,14 @@
prop = CuminProperty(self, "machine")
prop.title = "Architecture"
+ stat = CuminStat(self, "memFree")
+ stat.title = "Free Memory"
+ stat.highlow = True
+
+ stat = CuminStat(self, "loadAverage1Min")
+ stat.title = "1 Minute Load Average"
+ stat.highlow = True
+
action = self.SystemSlotVisualization(self, "slots")
action.navigable = False
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-12-12 16:40:01 UTC (rev 2991)
@@ -119,6 +119,14 @@
self.grid = self.SlotUtilizationGrid(app, "slot_grid")
self.add_child(self.grid)
+ chart = StatValueChart(app, "freemem")
+ chart.stats = ("memFree",)
+ self.add_child(chart)
+
+ chart = StatValueChart(app, "loadavg")
+ chart.stats = ("loadAverage1Min",)
+ self.add_child(chart)
+
def render_title(self, session):
return "Statistics"
@@ -278,7 +286,3 @@
return "Broker"
else:
return "Daemon"
-
-
-
-
Modified: mgmt/trunk/cumin/python/cumin/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-12 16:19:59 UTC (rev 2990)
+++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-12 16:40:01 UTC (rev 2991)
@@ -84,7 +84,19 @@
}
[SystemStats.html]
-{slot_grid}
+<table class="twocol">
+ <tbody>
+ <tr>
+ <td>
+ {slot_grid}
+ </td>
+ <td>
+ {freemem}
+ {loadavg}
+ </td>
+ </tr>
+ </tbody>
+</table>
<script type="text/javascript">
var show_slot_job_url = "{slot_job_url}";
</script>