Author: justi9 Date: 2008-12-11 11:59:56 -0500 (Thu, 11 Dec 2008) New Revision: 2973 Modified: mgmt/trunk/cumin/python/cumin/system.py mgmt/trunk/cumin/python/cumin/system.strings Log: Add a load average column to the systems table Modified: mgmt/trunk/cumin/python/cumin/system.py =================================================================== --- mgmt/trunk/cumin/python/cumin/system.py 2008-12-11 16:33:43 UTC (rev 2972) +++ mgmt/trunk/cumin/python/cumin/system.py 2008-12-11 16:59:56 UTC (rev 2973) @@ -20,6 +20,10 @@ col = self.NameColumn(app, "name") self.add_column(col) self.set_default_column(col) + + col = self.LoadColumn(app, "load") + col.alignment = "right" + self.add_column(col) def render_title(self, session, *args): return "Systems %s" % fmt_count(self.get_item_count(session, *args)) @@ -33,6 +37,13 @@ href = self.page.main.system.get_href(session, system) return fmt_link(href, fmt_shorten(data["name"])) + class LoadColumn(SqlTableColumn): + def render_title(self, session, data): + return "Load Average" + + def render_content(self, session, data): + return "%0.3f" % data["load_average1_min"] + class TopSystemSet(TopTable): def __init__(self, app, name): super(TopSystemSet, self).__init__(app, name) Modified: mgmt/trunk/cumin/python/cumin/system.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/system.strings 2008-12-11 16:33:43 UTC (rev 2972) +++ mgmt/trunk/cumin/python/cumin/system.strings 2008-12-11 16:59:56 UTC (rev 2973) @@ -1,6 +1,7 @@ [SystemSet.sql] -select s.id, s.node_name as name +select s.id, s.node_name as name, c.load_average1_min from sysimage as s +left outer join sysimage_stats as c on c.id = s.stats_curr_id {sql_orderby} {sql_limit}