Author: eallen
Date: 2011-04-06 20:27:47 +0000 (Wed, 06 Apr 2011)
New Revision: 4692
Modified:
trunk/cumin/python/cumin/grid/dashboard.py
trunk/cumin/python/cumin/grid/dashboard.strings
Log:
Move the scheduler aggregates to performance radio button
Add a table to the summary radio button for the scheduler rates
Remove the word summary from the tables on the summary page
Modified: trunk/cumin/python/cumin/grid/dashboard.py
===================================================================
--- trunk/cumin/python/cumin/grid/dashboard.py 2011-04-06 19:24:43 UTC (rev 4691)
+++ trunk/cumin/python/cumin/grid/dashboard.py 2011-04-06 20:27:47 UTC (rev 4692)
@@ -24,9 +24,6 @@
self.collector = collector
- scheduler_stats = DashboardSchedulerStats(app, "s", collector)
- self.add_tab(scheduler_stats)
-
dashboard = DashboardSummary(app, "d", collector)
self.add_tab(dashboard)
@@ -43,38 +40,6 @@
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"
- 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"
- 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"
- rates.add_child(stats)
-
- columns = (cls.JobsExited, cls.JobsExitedCum)
- stats = DashboardSummaryStats(app, "exited", collector, cls, columns,
"Jobs.Exited")
- stats.title = "Aggregate job exited 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"
- others.add_child(stats)
-
def render_title(self, session):
return "Scheuler Stats"
@@ -82,12 +47,18 @@
def __init__(self, app, name, collector):
super(DashboardSummary, self).__init__(app, name)
- slot_data = GridSlotsSummary(app, "slots_summary", collector)
- self.add_child(slot_data)
+ cls = app.model.com_redhat_grid.Scheduler
+ columns = (cls.JobSubmissionRate, cls.JobStartRate, cls.JobCompletionRate)
+ stats = DashboardSummaryStats(app, "rates", collector, cls, columns,
"Scheduler.Jobs")
+ stats.title = "Job scheduler info"
+ self.add_child(stats)
job_data = DashboardOverviewJobSummary(app, "jobs_summary", collector)
self.add_child(job_data)
+ slot_data = GridSlotsSummary(app, "slots_summary", collector)
+ self.add_child(slot_data)
+
neg_through = NegotiatorJobThroughput(app, "negotiator_throughput",
collector)
self.add_child(neg_through)
@@ -495,7 +466,7 @@
self.color_scheme = PieChartPage.GREENS
def render_title(self, session):
- return "Job summary info"
+ return "Job info"
class DashboardCapacitySlotSummary(DashboardPieSummarySet):
PERCENT_COLUMN = "% Memory used"
@@ -608,7 +579,7 @@
self.add_child(self.chart_link)
def render_title(self, session):
- return "Host summary info"
+ return "Host info"
def is_total(self, item):
index = self.attrs.index(item[0].name)
@@ -855,15 +826,47 @@
return "Slots Precessed"
class MonitorSelfSchedulerTable(Widget):
- def __init__(self, app, name, pool):
+ def __init__(self, app, name, collector):
super(MonitorSelfSchedulerTable, self).__init__(app, name)
cls = app.model.com_redhat_grid.Scheduler
frame = "main.grid.scheduler"
- self.table = MonitorSelfTable(app, "current", pool, cls, frame, False)
+ self.table = MonitorSelfTable(app, "current", collector, cls, frame,
False)
self.add_child(self.table)
+ 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"
+ 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"
+ 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"
+ rates.add_child(stats)
+
+ columns = (cls.JobsExited, cls.JobsExitedCum)
+ stats = DashboardSummaryStats(app, "exited", collector, cls, columns,
"Jobs.Exited")
+ stats.title = "Aggregate job exited 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"
+ others.add_child(stats)
+
def render_title(self, session):
return "Scheduler performance"
Modified: trunk/cumin/python/cumin/grid/dashboard.strings
===================================================================
--- trunk/cumin/python/cumin/grid/dashboard.strings 2011-04-06 19:24:43 UTC (rev 4691)
+++ trunk/cumin/python/cumin/grid/dashboard.strings 2011-04-06 20:27:47 UTC (rev 4692)
@@ -1,10 +1,7 @@
-[DashboardSummary.css]
-div.DashboardSummary {
- width: 950px;
-}
-
[DashboardSummary.html]
-<div id="{id}" class="{class}">{widgets}</div>
+<div id="{id}" class="{class}">
+ {widgets}
+</div>
<div style="clear:both;"></div>
[DashboardSummary.widget_html]
@@ -43,9 +40,29 @@
background-color: #E7E7F7;
}
+div.MonitorSelfSchedulerTable ul.WidgetSet {
+ padding: 0;
+ margin: 0;
+ list-style: none;
+}
+
+div.MonitorSelfSchedulerTable ul.WidgetSet li {
+ display: inline;
+}
+
+div.MonitorSelfSchedulerTable div.aggregates {
+ margin-top: 2em;
+}
+
[MonitorSelfSchedulerTable.html]
<div id="{id}" class="{class}">
<h2 class="title">{title}</h2>
+ <div class="aggregates">
+ {rate_widgets}
+ <div style="clear: left;"></div>
+ {other_widgets}
+ <div style="clear: left;"></div>
+ </div>
{table}
</div>
@@ -195,23 +212,19 @@
[NegotiatorJobThroughput.css]
div.NegotiatorJobThroughput {
clear: both;
+ padding-top: 2em;
}
-div.NegotiatorJobThroughput div.timeseries,
-div.NegotiatorJobThroughput div.stats {
- float: right;
+div.NegotiatorJobThroughput div.timeseries {
+ float: left;
}
-div.NegotiatorJobThroughput div.stats {
- margin-right: 5.3em;
-}
-
[NegotiatorJobThroughput.html]
<div class="{class}">
- <div class="timeseries">{timeseries}</div>
<div class="stats">{stats}</div>
+ <div class="timeseries">{timeseries}</div>
+ <div style="clear:both;"></div>
</div>
-<div style="clear:both;"></div>
[MinimalTableHeader.html]
<thead>
@@ -248,25 +261,6 @@
<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}">
- {rate_widgets}
- <div style="clear: left;"></div>
- {other_widgets}
-</div>
-<div style="clear:both;"></div>
-
[DashboardSummaryStats.html]
<div id="{id}" class="{class}">
<h3>{title}</h3>