Author: eallen
Date: 2011-04-05 19:44:12 +0000 (Tue, 05 Apr 2011)
New Revision: 4689
Modified:
trunk/cumin/python/cumin/grid/dashboard.py
trunk/cumin/python/cumin/grid/dashboard.strings
Log:
Tweak the layout for the scheduler stats
Modified: trunk/cumin/python/cumin/grid/dashboard.py
===================================================================
--- trunk/cumin/python/cumin/grid/dashboard.py 2011-04-05 19:22:50 UTC (rev 4688)
+++ trunk/cumin/python/cumin/grid/dashboard.py 2011-04-05 19:44:12 UTC (rev 4689)
@@ -39,35 +39,41 @@
def render_title(self, session):
return "Overview"
-class DashboardSchedulerStats(WidgetSet):
+class DashboardSchedulerStats(Widget):
def __init__(self, app, name, collector):
super(DashboardSchedulerStats, self).__init__(app, name)
+ rates = WidgetSet(app, "rate_widgets")
+ self.add_child(rates)
+
+ others = WidgetSet(app, "other_widgets")
+ self.add_child(others)
+
cls = app.model.com_redhat_grid.Scheduler
columns = (cls.JobsSubmitted, cls.JobSubmissionRate, cls.JobsSubmittedCum)
stats = DashboardSummaryStats(app, "submitted", collector, cls,
columns, "Jobs.Submitted")
stats.title = "Aggregate job submission stats"
- self.add_child(stats)
+ rates.add_child(stats)
columns = (cls.JobsStarted, cls.JobStartRate, cls.JobsStartedCum)
stats = DashboardSummaryStats(app, "started", collector, cls, columns,
"Jobs.Started")
stats.title = "Aggregate job started stats"
- self.add_child(stats)
+ rates.add_child(stats)
columns = (cls.JobsCompleted, cls.JobCompletionRate, cls.JobsCompletedCum)
stats = DashboardSummaryStats(app, "completed", collector, cls,
columns, "Jobs.Completed")
stats.title = "Aggregate job completion stats"
- self.add_child(stats)
+ rates.add_child(stats)
columns = (cls.JobsExited, cls.JobsExitedCum)
stats = DashboardSummaryStats(app, "exited", collector, cls, columns,
"Jobs.Exited")
stats.title = "Aggregate job exited stats"
- self.add_child(stats)
+ others.add_child(stats)
columns = (cls.ShadowExceptions, cls.ShadowExceptionsCum)
stats = DashboardSummaryStats(app, "exceptions", collector, cls,
columns, "Jobs.Exceptions")
stats.title = "Aggregate job shadow exceptions stats"
- self.add_child(stats)
+ others.add_child(stats)
def render_title(self, session):
return "Scheuler Stats"
Modified: trunk/cumin/python/cumin/grid/dashboard.strings
===================================================================
--- trunk/cumin/python/cumin/grid/dashboard.strings 2011-04-05 19:22:50 UTC (rev 4688)
+++ trunk/cumin/python/cumin/grid/dashboard.strings 2011-04-05 19:44:12 UTC (rev 4689)
@@ -248,13 +248,25 @@
<div id="pngSlotMap">{slot_png}</div>
</div>
+[DashboardSchedulerStats.css]
+div.DashboardSchedulerStats ul.WidgetSet {
+ padding: 0;
+ margin: 0;
+ list-style: none;
+}
+
+div.DashboardSchedulerStats ul.WidgetSet li {
+ display: inline;
+}
+
[DashboardSchedulerStats.html]
-<div id="{id}" class="{class}">{widgets}</div>
+<div id="{id}" class="{class}">
+ {rate_widgets}
+ <div style="clear: left;"></div>
+ {other_widgets}
+</div>
<div style="clear:both;"></div>
-[DashboardSchedulerStats.widget_html]
-{widget}
-
[DashboardSummaryStats.html]
<div id="{id}" class="{class}">
<h3>{title}</h3>