Author: justi9 Date: 2008-09-02 14:09:39 -0400 (Tue, 02 Sep 2008) New Revision: 2379 Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/scheduler.py mgmt/trunk/cumin/python/cumin/scheduler.strings Log: Add a users chart to the scheduler stats; reorder sched stats to correspond to the charts, roughly Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-09-02 17:45:14 UTC (rev 2378) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-02 18:09:39 UTC (rev 2379) @@ -1451,25 +1451,26 @@ prop = CuminProperty(self, "Machine") prop.title = "Machine" + prop.summary = True stat = CuminStat(self, "NumUsers") stat.title = "Users" - stat = CuminStat(self, "TotalHeldJobs") - stat.title = "Held Jobs" + stat = CuminStat(self, "TotalRunningJobs") + stat.title = "Running Jobs" stat = CuminStat(self, "TotalIdleJobs") stat.title = "Idle Jobs" + stat = CuminStat(self, "TotalHeldJobs") + stat.title = "Held Jobs" + stat = CuminStat(self, "TotalJobAds") stat.title = "Job Ads" stat = CuminStat(self, "TotalRemovedJobs") stat.title = "Removed Jobs" - stat = CuminStat(self, "TotalRunningJobs") - stat.title = "Running Jobs" - def get_title(self, session): return "Scheduler" Modified: mgmt/trunk/cumin/python/cumin/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-02 17:45:14 UTC (rev 2378) +++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-02 18:09:39 UTC (rev 2379) @@ -74,17 +74,30 @@ stats = StatSet(app, "general", "general") self.add_child(stats) - chart = self.RunningJobsChart(app, "jobs") + chart = self.UsersChart(app, "users") self.add_child(chart) + chart = self.JobsChart(app, "jobs") + self.add_child(chart) + def render_title(self, session): return "Statistics" - class RunningJobsChart(StatValueChart): + class UsersChart(StatValueChart): def __init__(self, app, name): - super(SchedulerStats.RunningJobsChart, self).__init__(app, name) + super(SchedulerStats.UsersChart, self).__init__(app, name) - self.stats = ("TotalRunningJobs",) + self.stats = ("NumUsers",) def render_title(self, session, sched): - return "Running Jobs" + return "Users" + + class JobsChart(StatValueChart): + def __init__(self, app, name): + super(SchedulerStats.JobsChart, self).__init__ \ + (app, name) + + self.stats = ("TotalRunningJobs", "TotalIdleJobs", "TotalHeldJobs") + + def render_title(self, session, sched): + return "Jobs" Modified: mgmt/trunk/cumin/python/cumin/scheduler.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-09-02 17:45:14 UTC (rev 2378) +++ mgmt/trunk/cumin/python/cumin/scheduler.strings 2008-09-02 18:09:39 UTC (rev 2379) @@ -16,6 +16,7 @@ {general} </td> <td> + {users} {jobs} </td> </tr>