rhmessaging commits: r3333 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-27 16:08:56 -0400 (Mon, 27 Apr 2009)
New Revision: 3333
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Added CuminGrid
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2009-04-27 20:08:10 UTC (rev 3332)
+++ mgmt/trunk/cumin/python/cumin/model.py 2009-04-27 20:08:56 UTC (rev 3333)
@@ -71,6 +71,7 @@
CuminSystem(self)
CuminSlot(self)
+ CuminGrid(self)
def check(self):
self.mint.check()
@@ -586,6 +587,62 @@
prop.title = "Last Updated"
prop.summary = True
+class CuminGrid(RemoteClass):
+ def __init__(self, model):
+ super(CuminGrid, self).__init__(model, "grid", Grid, GridStats)
+
+ prop = CuminProperty(self, "Name")
+ prop.title = "Name"
+
+ prop = CuminProperty(self, "Pool")
+ prop.title = "Pool"
+
+ prop = CuminProperty(self, "JobLimit")
+ prop.title = "Job Limit"
+
+ prop = CuminProperty(self, "SubmitLimit")
+ prop.title = "Submit Limit"
+
+ prop = CuminProperty(self, "GridResourceUnavailableTime")
+ prop.title = "Grid Resource Unavailable Time"
+
+ stat = CuminStat(self, "NumJobs")
+ stat.title = "Num Jobs"
+ stat.category = "general"
+
+ stat = CuminStat(self, "SubmitsInProgress")
+ stat.title = "Submits In Progress"
+ stat.category = "general"
+
+ stat = CuminStat(self, "SubmitsQueued")
+ stat.title = "Submits Queued"
+ stat.category = "general"
+
+ stat = CuminStat(self, "SubmitsAllowed")
+ stat.title = "Submits Allowed"
+ stat.category = "general"
+
+ stat = CuminStat(self, "SubmitsWanted")
+ stat.title = "Submits Wanted"
+ stat.category = "general"
+
+ stat = CuminStat(self, "RunningJobs")
+ stat.title = "Running Jobs"
+ stat.category = "general"
+
+ stat = CuminStat(self, "IdleJobs")
+ stat.title = "Idle Jobs"
+ stat.category = "general"
+
+ def init(self):
+ self.frame = self.model.frame.grid.pool
+
+ def get_title(self, session):
+ return "Grid"
+
+ def get_icon_href(self, session):
+ return "resource?name=pool-36.png"
+
class CuminSlot(RemoteClass):
def __init__(self, model):
super(CuminSlot, self).__init__(model, "slot", Slot, SlotStats)
15 years, 8 months
rhmessaging commits: r3332 - mgmt/trunk/cumin/python/cumin/grid.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-27 16:08:10 -0400 (Mon, 27 Apr 2009)
New Revision: 3332
Modified:
mgmt/trunk/cumin/python/cumin/grid/scheduler.py
Log:
Stat charts now use numbers instead of letters for the duration values.
Modified: mgmt/trunk/cumin/python/cumin/grid/scheduler.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/scheduler.py 2009-04-24 19:46:56 UTC (rev 3331)
+++ mgmt/trunk/cumin/python/cumin/grid/scheduler.py 2009-04-27 20:08:10 UTC (rev 3332)
@@ -156,11 +156,11 @@
self.add_child(stats)
chart = self.UsersChart(app, "users")
- chart.duration.param.default = "h"
+ chart.duration.param.default = "3600"
self.add_child(chart)
chart = self.JobsChart(app, "jobs")
- chart.duration.param.default = "h"
+ chart.duration.param.default = "3600"
self.add_child(chart)
def render_title(self, session):
15 years, 8 months
rhmessaging commits: r3331 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-24 15:46:56 -0400 (Fri, 24 Apr 2009)
New Revision: 3331
Modified:
mgmt/trunk/cumin/python/cumin/model.py
Log:
Add self.mint to CuminAction since all the methods rely on it being there. The alternative is to change the methods to use self.model.mint.model instead of self.mint.model.
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2009-04-24 14:57:00 UTC (rev 3330)
+++ mgmt/trunk/cumin/python/cumin/model.py 2009-04-24 19:46:56 UTC (rev 3331)
@@ -209,6 +209,7 @@
class CuminAction(object):
def __init__(self, cls, name):
self.model = cls.model
+ self.mint = self.model.mint
self.cumin_class = cls
self.name = name
15 years, 8 months
rhmessaging commits: r3330 - mgmt/trunk/cumin/resources.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-24 10:57:00 -0400 (Fri, 24 Apr 2009)
New Revision: 3330
Modified:
mgmt/trunk/cumin/resources/app.css
mgmt/trunk/cumin/resources/app.js
Log:
Better way of handling double-click on fullpage title bar.
Modified: mgmt/trunk/cumin/resources/app.css
===================================================================
--- mgmt/trunk/cumin/resources/app.css 2009-04-23 21:21:50 UTC (rev 3329)
+++ mgmt/trunk/cumin/resources/app.css 2009-04-24 14:57:00 UTC (rev 3330)
@@ -502,6 +502,15 @@
z-index: 0;
}
+div.fullpageTitleBar {
+ position: absolute;
+ height: 22px;
+ top: -2px;
+ left: -4px;
+ width: 100%;
+ z-index: 3;
+}
+
p.fullpageIcon {
background-color: white;
border-top: 2px solid #685B8A;
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-04-23 21:21:50 UTC (rev 3329)
+++ mgmt/trunk/cumin/resources/app.js 2009-04-24 14:57:00 UTC (rev 3330)
@@ -106,15 +106,17 @@
var element = elements[i];
element.removeClass('fullpageable');
- var outer = new Element('div', {'class': 'fullpageable',
+ var outer = new Element('div', {'class': 'fullpageable'});
+ var titleBack = new Element('div', {'class': 'fullpageTitle'});
+ var titleBar = new Element('div', {'class': 'fullpageTitleBar',
'events': {'dblclick': function () {fullpage(this);}}});
- var title = new Element('div', {'class': 'fullpageTitle'});
var icon = new Element('p', {'class': 'fullpageIcon',
'title': 'Full Page',
'events': {'click': function () {fullpage(this);}}});
var container = new Element('div', {'class': 'widgetContainer'});
- outer.appendChild(title);
+ outer.appendChild(titleBack);
+ outer.appendChild(titleBar);
outer.appendChild(icon);
outer.appendChild(container);
15 years, 8 months
rhmessaging commits: r3329 - mgmt/trunk/cumin/resources.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-23 17:21:50 -0400 (Thu, 23 Apr 2009)
New Revision: 3329
Modified:
mgmt/trunk/cumin/resources/app.js
Log:
Allow fullpaged stacked charts to be between 200 and 600 px tall.
Modified: mgmt/trunk/cumin/resources/app.js
===================================================================
--- mgmt/trunk/cumin/resources/app.js 2009-04-23 20:33:39 UTC (rev 3328)
+++ mgmt/trunk/cumin/resources/app.js 2009-04-23 21:21:50 UTC (rev 3329)
@@ -185,7 +185,8 @@
setFullpageParam(true, oFullPage);
var onfullpage = oFullPage.onfullpage;
var coords = $(oFullPage).getCoordinates();
- if (onfullpage) onfullpage(coords.width, coords.height);
+ var height = Math.min(Math.max(window.getSize().y - 100, 200), 600);
+ if (onfullpage) onfullpage(coords.width, height);
}
}
15 years, 8 months
rhmessaging commits: r3328 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-23 16:33:39 -0400 (Thu, 23 Apr 2009)
New Revision: 3328
Modified:
mgmt/trunk/cumin/python/cumin/stat.py
Log:
Account for multiple samples with the same qmf_update_time for a statistic on the stacked graphs.
Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py 2009-04-23 18:22:49 UTC (rev 3327)
+++ mgmt/trunk/cumin/python/cumin/stat.py 2009-04-23 20:33:39 UTC (rev 3328)
@@ -471,18 +471,22 @@
points = dict()
samples = dict()
+ collapsed = dict()
values = dict()
for stat in stats:
samples[stat] = stat.samples(object, duration)
+ # we sometimes get multiple samples for the same qmf_update_time
for sample in samples[stat]:
- t = sample[0]
+ collapsed[sample[0]] = sample[1]
+
+ for t in collapsed:
if not t in points:
points[t] = list()
values[t] = 0
- points[t].append(sample[1])
- values[t] = values[t] + sample[1]
- max_value = max(nvl(values[t], 0), max_value)
- min_value = min(nvl(values[t], 0), min_value)
+ points[t].append(collapsed[t])
+ values[t] = values[t] + collapsed[t]
+ max_value = max(values[t], max_value)
+ min_value = min(values[t], min_value)
max_value = round(max_value * 1.1 + 1)
15 years, 8 months
rhmessaging commits: r3327 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-23 14:22:49 -0400 (Thu, 23 Apr 2009)
New Revision: 3327
Modified:
mgmt/trunk/cumin/python/cumin/stat.py
mgmt/trunk/cumin/python/cumin/stat.strings
Log:
Set stacked chart width and height when expanding and restoring
Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py 2009-04-23 17:58:57 UTC (rev 3326)
+++ mgmt/trunk/cumin/python/cumin/stat.py 2009-04-23 18:22:49 UTC (rev 3327)
@@ -455,54 +455,35 @@
self.container_height.default = 100
self.add_parameter(self.container_height)
- def fake_samples(self, count, t, diff):
- start = randrange(1, 100)
-
- return [ (t+timedelta(seconds=-i*diff), start + randrange(-5, 5)) for i in range(0, count) ]
-
def do_render(self, session, object):
- chart = StackedValueChart(self.container_width.get(session), self.container_height.get(session), 100)
-
cls = self.class_.get(session)
stats = [getattr(cls, x) for x in self.stats.get(session)]
+ legend_height = len(stats) * 16 + 16
- samples = dict()
- values = dict()
+ chart = StackedValueChart(self.container_width.get(session),
+ self.container_height.get(session),
+ legend_height)
duration = self.duration.get(session)
- #XXX fake stats for now
- #count = self.container_width.get(session) / 3
- #t = datetime.now()
- #seed(1)
- #for stat in stats:
- # samples[stat] = self.fake_samples(min(count, 200), t, 10)
+ max_value = 1
+ min_value = 999999
- for stat in stats:
- samples[stat] = stat.samples(object, duration)
-
points = dict()
+ samples = dict()
+ values = dict()
for stat in stats:
+ samples[stat] = stat.samples(object, duration)
for sample in samples[stat]:
t = sample[0]
if not t in points:
points[t] = list()
+ values[t] = 0
points[t].append(sample[1])
+ values[t] = values[t] + sample[1]
+ max_value = max(nvl(values[t], 0), max_value)
+ min_value = min(nvl(values[t], 0), min_value)
- for t in points:
- values[t] = 0
- for v in points[t]:
- values[t] = values[t] + v
-
- max_value = 1
- min_value = 0
-
- for t in points:
- vals = values[t]
- if vals:
- max_value = max(nvl(vals, 0), max_value)
- min_value = min(nvl(vals, 0), min_value)
-
max_value = round(max_value * 1.1 + 1)
if min_value < 0:
Modified: mgmt/trunk/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.strings 2009-04-23 17:58:57 UTC (rev 3326)
+++ mgmt/trunk/cumin/python/cumin/stat.strings 2009-04-23 18:22:49 UTC (rev 3327)
@@ -159,6 +159,9 @@
src = branch.marshal();
src = cumin.refreshTime(src);
+ oImg.className = "Loading";
+ oImg.width = width;
+ oImg.height = height;
oImg.style.visibility = "hidden";
oImg.src = src;
}
@@ -185,8 +188,12 @@
$('{id}').onfullpage = function (width, height) { stackedNotify(true, width, height, '{id}'); };
$('{id}').onrestore = function () { stackedNotify(false, {width}, 100, '{id}'); };
var oImg = document.images['{id}'];
- $(oImg).addEvent('load', function () { this.style.visibility = "visible" });
- $(oImg).addEvent('dblclick', function () {fullpage(this.parentNode.parentNode.parentNode.getElementsByTagName('p')[0])});
+ $(oImg).addEvent('load', function () {
+ this.style.visibility = "visible";
+ this.removeAttribute("width");
+ this.removeAttribute("height");
+ this.className = "";
+ });
}())
//]]>
</script>
15 years, 8 months
rhmessaging commits: r3326 - store/branches/java/0.5-release/bin.
by rhmessaging-commits@lists.jboss.org
Author: ritchiem
Date: 2009-04-23 13:58:57 -0400 (Thu, 23 Apr 2009)
New Revision: 3326
Modified:
store/branches/java/0.5-release/bin/qpid-server-bdb.bat
Log:
Added defaulting of QPID_HOME
merged from trunk r3325
Modified: store/branches/java/0.5-release/bin/qpid-server-bdb.bat
===================================================================
--- store/branches/java/0.5-release/bin/qpid-server-bdb.bat 2009-04-23 17:57:06 UTC (rev 3325)
+++ store/branches/java/0.5-release/bin/qpid-server-bdb.bat 2009-04-23 17:58:57 UTC (rev 3326)
@@ -19,6 +19,22 @@
set VERSION=0.5
+rem Guess QPID_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%QPID_HOME%" == "" goto gotHome
+set QPID_HOME=%CURRENT_DIR%
+echo %QPID_HOME%
+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome
+cd ..
+set QPID_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome
+echo The QPID_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
set BDBSTORE_HOME=%QPID_HOME%
set QPID_MODULE_JARS=%BDBSTORE_HOME%\lib\qpid-bdbstore-%VERSION%.jar;%BDBSTORE_HOME%\lib\je-3.3.62.jar
15 years, 8 months
rhmessaging commits: r3325 - store/trunk/java/bdbstore/bin.
by rhmessaging-commits@lists.jboss.org
Author: ritchiem
Date: 2009-04-23 13:57:06 -0400 (Thu, 23 Apr 2009)
New Revision: 3325
Modified:
store/trunk/java/bdbstore/bin/qpid-server-bdb.bat
Log:
Added defaulting of QPID_HOME
Modified: store/trunk/java/bdbstore/bin/qpid-server-bdb.bat
===================================================================
--- store/trunk/java/bdbstore/bin/qpid-server-bdb.bat 2009-04-23 17:50:42 UTC (rev 3324)
+++ store/trunk/java/bdbstore/bin/qpid-server-bdb.bat 2009-04-23 17:57:06 UTC (rev 3325)
@@ -19,6 +19,22 @@
set VERSION=0.5
+rem Guess QPID_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%QPID_HOME%" == "" goto gotHome
+set QPID_HOME=%CURRENT_DIR%
+echo %QPID_HOME%
+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome
+cd ..
+set QPID_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome
+echo The QPID_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
set BDBSTORE_HOME=%QPID_HOME%
set QPID_MODULE_JARS=%BDBSTORE_HOME%\lib\qpid-bdbstore-%VERSION%.jar;%BDBSTORE_HOME%\lib\je-3.3.62.jar
15 years, 8 months
rhmessaging commits: r3324 - mgmt/trunk/cumin/python/cumin.
by rhmessaging-commits@lists.jboss.org
Author: eallen
Date: 2009-04-23 13:50:42 -0400 (Thu, 23 Apr 2009)
New Revision: 3324
Modified:
mgmt/trunk/cumin/python/cumin/charts.py
Log:
Move legend for statcked charts down a bit
Modified: mgmt/trunk/cumin/python/cumin/charts.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/charts.py 2009-04-23 17:44:57 UTC (rev 3323)
+++ mgmt/trunk/cumin/python/cumin/charts.py 2009-04-23 17:50:42 UTC (rev 3324)
@@ -300,7 +300,7 @@
for i, item in enumerate(zip(titles, colors)):
title, color = item
- y = self.height + 16 + i * 16
+ y = self.height + 26 + i * 16
cr.set_source_rgba(1, 1, 1, 0.75)
cr.rectangle(4, y - 12, 16 + 6.5 * len(title), 16)
15 years, 8 months