rhmessaging commits: r1938 - in mgmt: cumin/python/wooly and 1 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 16:32:38 -0400 (Thu, 17 Apr 2008)
New Revision: 1938
Modified:
mgmt/cumin/python/cumin/broker.strings
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/stat.strings
mgmt/cumin/python/wooly/widgets.strings
mgmt/notes/justin-todo.txt
Log:
Reorganize and simplify css rules
Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings 2008-04-17 19:01:18 UTC (rev 1937)
+++ mgmt/cumin/python/cumin/broker.strings 2008-04-17 20:32:38 UTC (rev 1938)
@@ -120,8 +120,31 @@
</tr>
</table>
+[BrokerBrowser.css]
+table.BrokerBrowser {
+ width: 100%;
+}
+
+table.BrokerBrowser td.nav {
+ width: 20%;
+ vertical-align: top;
+}
+
+table.BrokerBrowser td.nav h2 {
+ font-weight: normal;
+ font-size: 0.9em;
+}
+
+table.BrokerBrowser td.nav ul {
+ margin: 0 0 1em 0;
+}
+
+table.BrokerBrowser td.view {
+ width: 80%;
+}
+
[BrokerBrowser.html]
-<table class="browser">
+<table class="BrokerBrowser">
<tr>
<td class="nav">
<ul class="actions">
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2008-04-17 19:01:18 UTC (rev 1937)
+++ mgmt/cumin/python/cumin/page.strings 2008-04-17 20:32:38 UTC (rev 1938)
@@ -35,25 +35,21 @@
padding: 1em;
}
-tr {
- vertical-align: top;
- text-align: left;
-}
-
-span.none {
- font-style: italic;
- color: #999;
-}
-
-h1, h2 {
+h1 {
+ font-size: 1.1em;
margin: 0;
}
h2 {
font-size: 1em;
- margin: 0 0 0.5em 0;
+ margin: 0;
}
+span.none {
+ font-style: italic;
+ color: #999;
+}
+
.oblock {
padding: 0;
background-color: white;
@@ -112,44 +108,7 @@
margin: 0 0.5em 0 0;
}
-table.props {
- margin: 0 0 1.5em 0;
- width: 32em;
- border-collapse: collapse;
-}
-
-table.props tr {
- border-top: 1px dotted #ccc;
- vertical-align: top;
-}
-
-table.props th, table.props td {
- text-align: left;
- padding: 0.25em 0.5em;
-}
-
-table.props th {
- background-color: #f7f7f7;
- font-weight: normal;
-}
-
-table.props td {
- width: 60%;
-}
-
-table.props th.actions {
- padding: 0.5em;
- background-color: #e7e7f7;
-}
-
-table.props th.actions h2 {
- display: inline;
- font-weight: normal;
- font-size: 0.9em;
- margin: 0 0.5em 0 0;
-}
-
-button, table.props th.actions a, ul.actions a, a.action {
+button, ul.actions a, a.action {
margin: 0;
border: 1px solid #ddd;
padding: 0.25em 0.5em 0.15em 0.5em;
@@ -158,7 +117,7 @@
font-size: 0.9em;
}
-button:hover, table.props th.actions a:hover, ul.actions a:hover, a.action:hover {
+button:hover, ul.actions a:hover, a.action:hover {
background-color: white;
}
@@ -394,51 +353,13 @@
content: url(resource?name=radio-button-checked.png);
}
-.browser {
- width: 100%;
-}
-
-.browser .nav {
- width: 20%;
-}
-
-.browser .nav h2 {
- font-weight: normal;
- font-size: 0.9em;
-}
-
-.browser .nav ul {
- margin: 0 0 1em 0;
-}
-
-.BrokerClusterBrowser.groups h2 {
- color: #685b8a;
- /* color: #564979; */
- font-size: 0.9em;
- border-bottom: 1px dotted #ddd;
- width: 80%;
- margin: 0 0 0.5em 0;
-}
-
-.browser .view {
- width: 80%;
-}
-
-td.twocol {
- width: 50%;
- padding: 0 1em 0 0;
-}
-
-table.layout {
- width: 100%;
-}
-
table.twocol {
width: 100%;
}
table.twocol > tbody > tr > td {
width: 50%;
+ vertical-align: top;
}
table.twocol > tbody > tr > td:first-child {
Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings 2008-04-17 19:01:18 UTC (rev 1937)
+++ mgmt/cumin/python/cumin/stat.strings 2008-04-17 20:32:38 UTC (rev 1938)
@@ -67,6 +67,10 @@
text-align: right;
}
+table.StatSet tbody th {
+ text-align: left;
+}
+
table.StatSet td {
text-align: right;
}
@@ -131,10 +135,6 @@
width: 30em;
}
-div.StatValueChart h2 {
- margin: 0;
-}
-
div.StatValueChart div.duration {
margin: 1em 0 0.5em 1em;
}
Modified: mgmt/cumin/python/wooly/widgets.strings
===================================================================
--- mgmt/cumin/python/wooly/widgets.strings 2008-04-17 19:01:18 UTC (rev 1937)
+++ mgmt/cumin/python/wooly/widgets.strings 2008-04-17 20:32:38 UTC (rev 1938)
@@ -2,17 +2,17 @@
{mode}
[TabbedModeSet.css]
-.TabbedModeSet.tabs {
+ul.TabbedModeSet.tabs {
padding: 0;
margin: 0;
list-style: none;
}
-.TabbedModeSet.tabs li {
+ul.TabbedModeSet.tabs li {
display: inline;
}
-.TabbedModeSet.tabs li a {
+ul.TabbedModeSet.tabs li a {
padding: 0.275em 0.5em;
border-top: 1px solid #ccc;
border-right: 1px solid #ccc;
@@ -21,17 +21,17 @@
line-height: 1.5em;
}
-.TabbedModeSet.tabs li:first-child a {
+ul.TabbedModeSet.tabs li:first-child a {
border-left: 1px solid #ccc;
}
-.TabbedModeSet.tabs li a.selected {
+ul.TabbedModeSet.tabs li a.selected {
background-color: #fff;
position: relative;
z-index: 2;
}
-.TabbedModeSet.mode {
+div.TabbedModeSet.mode {
background-color: white;
padding: 1em;
border: 1px solid #ccc;
@@ -59,7 +59,7 @@
<a class="{class}" href="{href}">{content}</a>
[Toggle.css]
-.Toggle.on {
+a.Toggle.on {
font-weight: bold;
}
@@ -134,11 +134,13 @@
[PropertySet.css]
table.PropertySet th, table.PropertySet td {
padding: 0 0.5em 0 0;
+ vertical-align: top;
}
table.PropertySet th {
color: #444;
font-weight: normal;
+ text-align: left;
}
[PropertySet.html]
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2008-04-17 19:01:18 UTC (rev 1937)
+++ mgmt/notes/justin-todo.txt 2008-04-17 20:32:38 UTC (rev 1938)
@@ -36,6 +36,8 @@
* Fix the chart left side "pinch" problem
+ * Move to just a single category for stats
+
Deferred
* En dashes don't disappear on stat update
16 years, 2 months
rhmessaging commits: r1937 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 15:01:18 -0400 (Thu, 17 Apr 2008)
New Revision: 1937
Modified:
mgmt/cumin/python/cumin/stat.strings
Log:
Margin tweaks
Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings 2008-04-17 18:51:52 UTC (rev 1936)
+++ mgmt/cumin/python/cumin/stat.strings 2008-04-17 19:01:18 UTC (rev 1937)
@@ -136,7 +136,7 @@
}
div.StatValueChart div.duration {
- margin: 1em 1em 0.5em 1em;
+ margin: 1em 0 0.5em 1em;
}
div.StatValueChart ul.radiotabs {
@@ -144,7 +144,7 @@
}
div.StatValueChart img {
- margin: 0 1em;
+ margin: 0 0 0 1em;
}
[StatValueChart.html]
16 years, 2 months
rhmessaging commits: r1936 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 14:51:52 -0400 (Thu, 17 Apr 2008)
New Revision: 1936
Modified:
mgmt/cumin/python/cumin/client.strings
mgmt/cumin/python/cumin/exchange.strings
mgmt/cumin/python/cumin/model.py
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/queue.strings
Log:
An improved two-column table layout
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2008-04-17 18:37:02 UTC (rev 1935)
+++ mgmt/cumin/python/cumin/client.strings 2008-04-17 18:51:52 UTC (rev 1936)
@@ -110,13 +110,13 @@
}
[ClientStats.html]
-<table class="layout">
+<table class="twocol">
<tr>
- <td class="twocol">
+ <td>
<h2>General</h2>
{general}
</td>
- <td class="twocol">
+ <td>
{sendrecv}
</td>
</tr>
Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings 2008-04-17 18:37:02 UTC (rev 1935)
+++ mgmt/cumin/python/cumin/exchange.strings 2008-04-17 18:51:52 UTC (rev 1936)
@@ -194,16 +194,16 @@
</tr>
[ExchangeStats.html]
-<table class="layout">
+<table class="twocol">
<tr>
- <td class="twocol">
+ <td>
<h2>Messages</h2>
{messages}
<h2>General</h2>
{general}
</td>
- <td class="twocol">
+ <td>
{recvroutedrop}
{producers}
</td>
Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py 2008-04-17 18:37:02 UTC (rev 1935)
+++ mgmt/cumin/python/cumin/model.py 2008-04-17 18:51:52 UTC (rev 1936)
@@ -248,7 +248,7 @@
text = self.rate_text(object)
if text:
- html = "%s<small>/sec</small>" % text
+ html = text
else:
html = fmt_none_brief()
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2008-04-17 18:37:02 UTC (rev 1935)
+++ mgmt/cumin/python/cumin/page.strings 2008-04-17 18:51:52 UTC (rev 1936)
@@ -433,6 +433,22 @@
width: 100%;
}
+table.twocol {
+ width: 100%;
+}
+
+table.twocol > tbody > tr > td {
+ width: 50%;
+}
+
+table.twocol > tbody > tr > td:first-child {
+ padding: 0 1.5em 0 0;
+}
+
+table.twocol > tbody > tr > td:last-child {
+ padding: 0 0 0 1.5em;
+}
+
.ralign, table.mobjects .ralign, div.mstatus table .ralign {
text-align: right;
}
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2008-04-17 18:37:02 UTC (rev 1935)
+++ mgmt/cumin/python/cumin/queue.strings 2008-04-17 18:51:52 UTC (rev 1936)
@@ -180,16 +180,16 @@
<div class="radiotabs mode">{mode}</div>
[QueueStatsGeneral.html]
-<table class="layout">
+<table class="twocol">
<tr>
- <td class="twocol">
+ <td>
<h2>Messages</h2>
{messages}
<h2>General</h2>
{general}
</td>
- <td class="twocol">
+ <td>
{enqdeq}
{depth}
{consumers}
@@ -198,29 +198,29 @@
</table>
[QueueStatsDurability.html]
-<table class="layout">
+<table class="twocol">
<tr>
- <td class="twocol">
+ <td>
<h2>Durable Messages</h2>
{messages}
</td>
- <td class="twocol">
+ <td>
{enqdeq}
</td>
</tr>
</table>
[QueueStatsTransactions.html]
-<table class="layout">
+<table class="twocol">
<tr>
- <td class="twocol">
+ <td>
<h2>Transactions</h2>
{transactions}
<h2>Transactional Messages</h2>
{messages}
</td>
- <td class="twocol">
+ <td>
{enqtxn}
{deqtxn}
{enqdeq}
16 years, 2 months
rhmessaging commits: r1935 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 14:37:02 -0400 (Thu, 17 Apr 2008)
New Revision: 1935
Modified:
mgmt/cumin/python/cumin/stat.py
mgmt/cumin/python/cumin/stat.strings
Log:
Prettify stat tables
Modified: mgmt/cumin/python/cumin/stat.py
===================================================================
--- mgmt/cumin/python/cumin/stat.py 2008-04-17 18:36:35 UTC (rev 1934)
+++ mgmt/cumin/python/cumin/stat.py 2008-04-17 18:37:02 UTC (rev 1935)
@@ -55,7 +55,7 @@
return stat.value_html(object)
- def render_item_extra(self, session, args):
+ def render_item_rate(self, session, args):
stat, object = args
#if False and stat.highlow: #XXX
Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings 2008-04-17 18:36:35 UTC (rev 1934)
+++ mgmt/cumin/python/cumin/stat.strings 2008-04-17 18:37:02 UTC (rev 1935)
@@ -43,46 +43,56 @@
[StatSet.css]
table.StatSet {
- width: 25em;
+ width: 100%;
border-collapse: collapse;
margin: 0.5em 0.5em 1em 0.5em;
}
table.StatSet tr {
border-top: 1px dotted #ccc;
- vertical-align: top;
}
-table.StatSet td {
+table.StatSet td, table.StatSet th {
padding: 0.35em 0.5em;
+ font-weight: normal;
}
table.StatSet th {
- padding: 0.35em 0.5em;
- text-align: left;
- font-weight: normal;
- background-color: #f7f7f7;
+ color: #444;
}
+table.StatSet thead th {
+ font-style: italic;
+ font-size: 0.9em;
+ text-align: right;
+}
+
+table.StatSet td {
+ text-align: right;
+}
+
[StatSet.html]
<table id="{id}" class="StatSet">
- <tr>
- <th style="width: 45%;">Statistic</th>
- <th style="width: 20%;" class="ralign">Current</th>
- <th style="width: 35%;" class="ralign">Rate</th>
- </tr>
-
- {items}
+ <thead>
+ <tr>
+ <th style="width: 50%; text-align: left;">Statistic</th>
+ <th style="width: 25%;">Value</th>
+ <th style="width: 25%;">Per Second</th>
+ </tr>
+ </thead>
+ <tbody>
+ {items}
+ </tbody>
</table>
<script>
cumin.objectListeners["{id}"] = updateStats;
</script>
[StatSet.item_html]
-<tr stat="{item_name}">
+<tr stat="{item_name}" class="item">
<th>{item_title}</th>
<td class="ralign"> {item_value}</td>
- <td class="ralign"> {item_extra}</td>
+ <td class="ralign"> {item_rate}</td>
</tr>
[StatValueChart.javascript]
16 years, 2 months
rhmessaging commits: r1934 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 14:36:35 -0400 (Thu, 17 Apr 2008)
New Revision: 1934
Modified:
mgmt/cumin/python/cumin/page.strings
Log:
Remove obsolete style rules
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2008-04-17 17:52:02 UTC (rev 1933)
+++ mgmt/cumin/python/cumin/page.strings 2008-04-17 18:36:35 UTC (rev 1934)
@@ -337,46 +337,6 @@
content: url(resource?name=radio-button-checked.png);
}
-div.mstatus {
- float: right;
- margin: 0.5em;
- padding: 0.75em 1em;
- width: 15em;
-}
-
-div.mstatus h2 {
- font-weight: bold;
-}
-
-div.mstatus div, div.mstatus h2 {
- margin: 0 0 0.5em 0;
-}
-
-div.mstatus.red {
- border: 1px dotted #c99;
- background-color: #fcc;
-}
-
-div.mstatus.yellow {
- border: 1px dotted #cc9;
- background-color: #ffc;
-}
-
-div.mstatus.green {
- border: 1px dotted #9c9;
- background-color: #cfc;
-}
-
-div.mstatus table {
- width: 100%;
- font-size: 0.9em;
-}
-
-div.mstatus table th, div.mstatus table td {
- font-weight: normal;
- text-align: left;
-}
-
div.statuslight {
float: left;
width: 1em;
16 years, 2 months
rhmessaging commits: r1933 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 13:52:02 -0400 (Thu, 17 Apr 2008)
New Revision: 1933
Modified:
mgmt/cumin/python/cumin/widgets.strings
Log:
Squeeze status a little more
Modified: mgmt/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:49:40 UTC (rev 1932)
+++ mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:52:02 UTC (rev 1933)
@@ -126,7 +126,7 @@
div.CuminStatus {
float: right;
margin: 0.5em 0;
- padding: 0.75em 1em;
+ padding: 0.5em 0.75em;
width: 15em;
}
16 years, 2 months
rhmessaging commits: r1932 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 13:49:40 -0400 (Thu, 17 Apr 2008)
New Revision: 1932
Modified:
mgmt/cumin/python/cumin/queue.strings
Log:
Remove depth acceleration from queue status
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:47:55 UTC (rev 1931)
+++ mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:49:40 UTC (rev 1932)
@@ -70,8 +70,7 @@
null,
{"td": [s.msgTotalEnqueues.rate, s.byteTotalEnqueues.rate]},
{"td": [s.msgTotalDequeues.rate, s.byteTotalDequeues.rate]},
- {"td": [s.msgDepth.value, s.byteDepth.value]},
- {"td": [s.msgDepth.rate, s.byteDepth.rate]}
+ {"td": [s.msgDepth.value, s.byteDepth.value]}
]
};
@@ -101,11 +100,6 @@
<td class="ralign">{message_depth}</td>
<td class="ralign">{byte_depth}</td>
</tr>
- <tr>
- <th>Accel.</th>
- <td class="ralign">{message_depth_accel}</td>
- <td class="ralign">{byte_depth_accel}</td>
- </tr>
</table>
</div>
<script>
16 years, 2 months
rhmessaging commits: r1931 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 13:47:55 -0400 (Thu, 17 Apr 2008)
New Revision: 1931
Modified:
mgmt/cumin/python/cumin/client.py
mgmt/cumin/python/cumin/client.strings
Log:
Revamp client stats
Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py 2008-04-17 17:30:14 UTC (rev 1930)
+++ mgmt/cumin/python/cumin/client.py 2008-04-17 17:47:55 UTC (rev 1931)
@@ -211,7 +211,7 @@
self.__tabs = TabbedModeSet(app, "tabs")
self.add_child(self.__tabs)
- self.__tabs.add_tab(ClientStatistics(app, "stats"))
+ self.__tabs.add_tab(ClientStats(app, "stats"))
self.__sessions = ClientSessionSet(app, "sessions")
self.__tabs.add_tab(self.__sessions)
@@ -225,42 +225,28 @@
data = "model.xml?class=client;id=%i" % queue.id
return "wooly.setIntervalUpdate('%s', updateClient, 3000)" % data
-class ClientStatistics(TabbedModeSet):
+class ClientStats(Widget):
def __init__(self, app, name):
- super(ClientStatistics, self).__init__(app, name)
+ super(ClientStats, self).__init__(app, name)
- self.add_tab(self.StatisticsCurrent(app, "current"))
- self.add_tab(self.StatisticsHistory(app, "history"))
+ self.add_child(StatSet(app, "general", "general"))
+ chart = self.SendReceiveRateChart(app, "sendrecv")
+ self.add_child(chart)
+
def render_title(self, session):
return "Statistics"
- class StatisticsCurrent(Widget):
+ class SendReceiveRateChart(StatValueChart):
def __init__(self, app, name):
- super(ClientStatistics.StatisticsCurrent, self).__init__(app, name)
+ super(ClientStats.SendReceiveRateChart, self).__init__(app, name)
- self.add_child(StatSet(app, "general", "general"))
+ self.stats = ("bytesFromClient", "bytesToClient")
+ self.mode = "rate"
- def render_title(self, session):
- return "Current"
+ def render_title(self, session, client):
+ return "Bytes Sent and Received"
- class StatisticsHistory(Widget):
- def __init__(self, app, name):
- super(ClientStatistics.StatisticsHistory, self).__init__(app, name)
-
- chart = StatValueChart(app, "sent")
- chart.stats = ("bytesFromClient",)
- chart.mode = "rate"
- self.add_child(chart)
-
- chart = StatValueChart(app, "received")
- chart.stats = ("bytesToClient",)
- chart.mode = "rate"
- self.add_child(chart)
-
- def render_title(self, session):
- return "History"
-
class ClientSessionSetDetach(CuminBulkActionForm, Frame):
def process_return(self, session):
branch = session.branch()
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2008-04-17 17:30:14 UTC (rev 1930)
+++ mgmt/cumin/python/cumin/client.strings 2008-04-17 17:47:55 UTC (rev 1931)
@@ -109,11 +109,7 @@
cumin.runObjectListeners(client);
}
-[ClientStatistics.html]
-<ul class="radiotabs tabs">{tabs}</ul>
-<div class="radiotabs mode">{mode}</div>
-
-[StatisticsCurrent.html]
+[ClientStats.html]
<table class="layout">
<tr>
<td class="twocol">
@@ -121,17 +117,11 @@
{general}
</td>
<td class="twocol">
+ {sendrecv}
</td>
</tr>
</table>
-[StatisticsHistory.html]
-<h2>Bytes Sent</h2>
-<div class="iblock chart">{sent}</div>
-
-<h2>Bytes Received</h2>
-<div class="iblock chart">{received}</div>
-
[ClientSessionSet.sql]
select s.id, s.name, c.expire_time as expires, c.attached as status
from session as s
16 years, 2 months
rhmessaging commits: r1930 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 13:30:14 -0400 (Thu, 17 Apr 2008)
New Revision: 1930
Modified:
mgmt/cumin/python/cumin/client.strings
mgmt/cumin/python/cumin/exchange.strings
mgmt/cumin/python/cumin/queue.strings
mgmt/cumin/python/cumin/widgets.py
mgmt/cumin/python/cumin/widgets.strings
Log:
Clean up CuminStatus styling
Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings 2008-04-17 17:16:10 UTC (rev 1929)
+++ mgmt/cumin/python/cumin/client.strings 2008-04-17 17:30:14 UTC (rev 1930)
@@ -71,11 +71,7 @@
}
[ClientStatus.html]
-<div id="{id}" class="{class}">
- <h2>Status</h2>
-
- <!-- <div>{status_info}</div> -->
-
+<div id="{id}" class="CuminStatus {color}">
<table>
<tr>
<th></th>
Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings 2008-04-17 17:16:10 UTC (rev 1929)
+++ mgmt/cumin/python/cumin/exchange.strings 2008-04-17 17:30:14 UTC (rev 1930)
@@ -128,11 +128,7 @@
}
[ExchangeStatus.html]
-<div id="{id}" class="{class}">
- <h2>Status</h2>
-
- <!-- <div>{status_info}</div> -->
-
+<div id="{id}" class="CuminStatus {color}">
<table>
<tr>
<th></th>
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:16:10 UTC (rev 1929)
+++ mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:30:14 UTC (rev 1930)
@@ -79,7 +79,7 @@
}
[QueueStatus.html]
-<div id="{id}" class="{class}">
+<div id="{id}" class="CuminStatus {color}">
<table>
<tr>
<th></th>
Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py 2008-04-17 17:16:10 UTC (rev 1929)
+++ mgmt/cumin/python/cumin/widgets.py 2008-04-17 17:30:14 UTC (rev 1930)
@@ -223,25 +223,17 @@
def get_args(self, session):
return self.frame.get_args(session)
- def render_class(self, session, object):
+ def render_color(self, session, object):
if hasattr(object, "errors"):
if object.errors:
- return "mstatus red"
+ return "red"
elif object.warnings:
- return "mstatus yellow"
+ return "yellow"
else:
- return "mstatus green"
+ return "green"
else:
- return "mstatus green"
+ return "green"
- def render_status_info(self, session, object):
- error_count = 0 #XXX len(object.errors)
- warning_count = 0 #XXX len(object.warnings)
-
- return "%i error%s, %i warning%s" % \
- (error_count, ess(error_count),
- warning_count, ess(warning_count))
-
class CuminProperties(PropertySet):
def get_args(self, session):
return self.frame.get_args(session)
Modified: mgmt/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:16:10 UTC (rev 1929)
+++ mgmt/cumin/python/cumin/widgets.strings 2008-04-17 17:30:14 UTC (rev 1930)
@@ -102,11 +102,11 @@
var warnings = wcount + " " + (wcount == "1" && "warning" || "warnings");
if (ecount != "0") {
- status.setattr("class", "mstatus red");
+ status.setattr("class", "CuminStatus red");
} else if (wcount != "0") {
- status.setattr("class", "mstatus yellow");
+ status.setattr("class", "CuminStatus yellow");
} else {
- status.setattr("class", "mstatus green");
+ status.setattr("class", "CuminStatus green");
}
*/
@@ -122,11 +122,50 @@
*/
}
+[CuminStatus.css]
+div.CuminStatus {
+ float: right;
+ margin: 0.5em 0;
+ padding: 0.75em 1em;
+ width: 15em;
+}
+
+div.CuminStatus h2 {
+ font-weight: bold;
+}
+
+div.CuminStatus div, div.CuminStatus h2 {
+ margin: 0 0 0.5em 0;
+}
+
+div.CuminStatus.red {
+ border: 1px dotted #c99;
+ background-color: #fcc;
+}
+
+div.CuminStatus.yellow {
+ border: 1px dotted #cc9;
+ background-color: #ffc;
+}
+
+div.CuminStatus.green {
+ border: 1px dotted #9c9;
+ background-color: #cfc;
+}
+
+div.CuminStatus table {
+ width: 100%;
+ font-size: 0.9em;
+}
+
+div.CuminStatus table th, div.CuminStatus table td {
+ font-weight: normal;
+ text-align: left;
+}
+
[CuminStatus.html]
-<div id="{id}" class="{class}">
+<div id="{id}" class="CuminStatus {color}">
<h2>Status</h2>
-
- <!-- <div>{status_info}</div> -->
</div>
[CuminDetails.css]
16 years, 2 months
rhmessaging commits: r1929 - mgmt/cumin/python/cumin.
by rhmessaging-commits＠lists.jboss.org
Author: justi9
Date: 2008-04-17 13:16:10 -0400 (Thu, 17 Apr 2008)
New Revision: 1929
Modified:
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/queue.strings
Log:
Add an enq/deq rate chart for transactional messages
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2008-04-17 17:07:13 UTC (rev 1928)
+++ mgmt/cumin/python/cumin/queue.py 2008-04-17 17:16:10 UTC (rev 1929)
@@ -511,6 +511,9 @@
chart = self.DequeueTransactionRateChart(app, "deqtxn")
self.add_child(chart)
+ chart = self.EnqueueDequeueRateChart(app, "enqdeq")
+ self.add_child(chart)
+
def render_title(self, session):
return "Transactions"
@@ -538,6 +541,17 @@
def render_title(self, session, queue):
return "Dequeue Transaction Operations per Second"
+ class EnqueueDequeueRateChart(StatValueChart):
+ def __init__(self, app, name):
+ super(QueueStatsTransactions.EnqueueDequeueRateChart,
+ self).__init__(app, name)
+
+ self.stats = ("msgTxnEnqueues", "msgTxnDequeues")
+ self.mode = "rate"
+
+ def render_title(self, session, queue):
+ return "Transactional Messages Enqueued and Dequeued"
+
class QueueConsumerSet(PaginatedItemSet):
def get_args(self, session):
return self.frame.get_args(session)
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:07:13 UTC (rev 1928)
+++ mgmt/cumin/python/cumin/queue.strings 2008-04-17 17:16:10 UTC (rev 1929)
@@ -229,6 +229,7 @@
<td class="twocol">
{enqtxn}
{deqtxn}
+ {enqdeq}
</td>
</tr>
</table>
16 years, 2 months