rhmessaging commits: r1939 - mgmt/cumin/python/cumin. - rhmessaging-commits

Thursday, 17 April 2008

Author: justi9
Date: 2008-04-17 17:20:52 -0400 (Thu, 17 Apr 2008)
New Revision: 1939

Modified:
   mgmt/cumin/python/cumin/client.py
   mgmt/cumin/python/cumin/client.strings
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/model.py
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/queue.strings
   mgmt/cumin/python/cumin/stat.py
   mgmt/cumin/python/cumin/stat.strings
Log:
Recategorize and move around stats.

Use various "Input/Output" categories in the stats UIs.  Move queue
depth stats out of IO into general.

Allow only one category for each stat.



Modified: mgmt/cumin/python/cumin/client.py
===================================================================

--- mgmt/cumin/python/cumin/client.py	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/client.py	2008-04-17 21:20:52 UTC (rev 1939)
@@ -229,6 +229,7 @@
     def __init__(self, app, name):
         super(ClientStats, self).__init__(app, name)
 
+        self.add_child(StatSet(app, "io", "io"))
         self.add_child(StatSet(app, "general", "general"))
 
         chart = self.SendReceiveRateChart(app, "sendrecv")

Modified: mgmt/cumin/python/cumin/client.strings
===================================================================
--- mgmt/cumin/python/cumin/client.strings	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/client.strings	2008-04-17 21:20:52 UTC (rev 1939)
@@ -113,6 +113,9 @@
 <table class="twocol">
   <tr>
     <td>
+      <h2>Input/Output</h2>
+      {io}
+
       <h2>General</h2>
       {general}
     </td>

Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/exchange.py	2008-04-17 21:20:52 UTC (rev 1939)
@@ -362,7 +362,7 @@
     def __init__(self, app, name):
         super(ExchangeStats, self).__init__(app, name)
 
-        self.add_child(StatSet(app, "messages", "message"))
+        self.add_child(StatSet(app, "io", "io"))
         self.add_child(StatSet(app, "general", "general"))
 
         chart = self.ReceiveRouteDropRateChart(app, "recvroutedrop")

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/exchange.strings	2008-04-17 21:20:52 UTC (rev 1939)
@@ -197,8 +197,8 @@
 <table class="twocol">
   <tr>
     <td>
-      <h2>Messages</h2>
-      {messages}
+      <h2>Input/Output</h2>
+      {io}
 
       <h2>General</h2>
       {general}

Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/model.py	2008-04-17 21:20:52 UTC (rev 1939)
@@ -81,7 +81,7 @@
 
         self.name = name
         self.title = None
-        self.categories = ()
+        self.category = "general"
         self.summary = False
 
         self.cumin_class.add_property(self)
@@ -188,7 +188,7 @@
         self.name = name
         self.unit = None
         self.title = None
-        self.categories = ()
+        self.category = "general"
         self.summary = False
 
         self.link_cb = None
@@ -363,19 +363,15 @@
 
         prop = CuminProperty(self, "idOriginal")
         prop.title = "Management ID"
-        prop.categories = ("basic",)
 
         prop = CuminProperty(self, "creationTime")
         prop.title = "Creation Time"
-        prop.categories = ("basic",)
 
         prop = CuminProperty(self, "deletionTime")
         prop.title = "Deletion Time"
-        prop.categories = ("basic",)
 
         prop = CuminProperty(self, "recTime")
         prop.title = "Last Updated"
-        prop.categories = ("basic",)
         prop.summary = True
 
 class LocalClass(CuminClass):
@@ -553,153 +549,148 @@
         stat = CuminStat(self, "consumers")
         stat.title = "Consumers"
         stat.unit = "consumer"
-        stat.categories = ("general",)
         stat.highlow = True
 
         stat = CuminStat(self, "bindings")
         stat.title = "Bindings"
         stat.unit = "binding"
-        stat.categories = ("general",)
         stat.highlow = True
 
         stat = CuminStat(self, "msgDepth")
         stat.title = "Message Depth"
-        stat.unit = "message"
-        stat.categories = ("message",)
         stat.highlow = True
 
         stat = CuminStat(self, "msgTotalEnqueues")
         stat.title = "Msgs. Enqueued"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "msgTotalDequeues")
         stat.title = "Msgs. Dequeued"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "byteDepth")
         stat.title = "Byte Depth"
         stat.unit = "byte"
-        stat.categories = ("message",)
         stat.highlow = True
 
         stat = CuminStat(self, "byteTotalEnqueues")
         stat.title = "Bytes Enqueued"
         stat.unit = "byte"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "byteTotalDequeues")
         stat.title = "Bytes Dequeued"
         stat.unit = "byte"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "unackedMessages")
         stat.title = "Msgs. Unacked"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
         stat.highlow = True
 
         stat = CuminStat(self, "messageLatencyMin")
         stat.title = "Min. Msg. Latency"
         stat.unit = "nanosecond"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "messageLatencyMax")
         stat.title = "Max. Msg. Latency"
         stat.unit = "nanosecond"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "messageLatencyAverage")
         stat.title = "Avg. Msg. Latency"
         stat.unit = "nanosecond"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         # Transactional
 
         stat = CuminStat(self, "msgTxnEnqueues")
         stat.title = "Msgs. Enqueued"
         stat.unit = "message"
-        stat.categories = ("transactional",)
+        stat.category = "io.txn"
 
         stat = CuminStat(self, "msgTxnDequeues")
         stat.title = "Msgs. Dequeued"
         stat.unit = "message"
-        stat.categories = ("transactional",)
+        stat.category = "io.txn"
 
         stat = CuminStat(self, "byteTxnEnqueues")
         stat.title = "Bytes Enqueued"
         stat.unit = "byte"
-        stat.categories = ("transactional",)
+        stat.category = "io.txn"
 
         stat = CuminStat(self, "byteTxnDequeues")
         stat.title = "Bytes Dequeued"
         stat.unit = "byte"
-        stat.categories = ("transactional",)
+        stat.category = "io.txn"
 
         stat = CuminStat(self, "enqueueTxnStarts")
         stat.title = "Enq. Trans. Started"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "enqueueTxnCommits")
         stat.title = "Enq. Trans. Committed"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "enqueueTxnRejects")
         stat.title = "Enq. Trans. Rejected"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "enqueueTxnCount")
         stat.title = "Enq. Trans. Pending"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
         stat.highlow = True
 
         stat = CuminStat(self, "dequeueTxnStarts")
         stat.title = "Deq. Trans. Started"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "dequeueTxnCommits")
         stat.title = "Deq. Trans. Committed"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "dequeueTxnRejects")
         stat.title = "Deq. Trans. Rejected"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
 
         stat = CuminStat(self, "dequeueTxnCount")
         stat.title = "Deq. Trans. Pending"
         stat.unit = "transaction"
-        stat.categories = ("transaction",)
+        stat.category = "txn"
         stat.highlow = True
 
-        # Persistent
+        # Durable
 
         stat = CuminStat(self, "msgPersistEnqueues")
         stat.title = "Msgs. Enqueued"
         stat.unit = "message"
-        stat.categories = ("persistent",)
+        stat.category = "io.durable"
 
         stat = CuminStat(self, "msgPersistDequeues")
         stat.title = "Msgs. Dequeued"
         stat.unit = "message"
-        stat.categories = ("persistent",)
+        stat.category = "io.durable"
 
         stat = CuminStat(self, "bytePersistEnqueues")
         stat.title = "Bytes Enqueued"
         stat.unit = "byte"
-        stat.categories = ("persistent",)
+        stat.category = "io.durable"
 
         stat = CuminStat(self, "bytePersistDequeues")
         stat.title = "Bytes Dequeued"
         stat.unit = "byte"
-        stat.categories = ("persistent",)
+        stat.category = "io.durable"
 
         action = self.Purge(self, "purge")
         action.summary = True
@@ -741,44 +732,42 @@
         stat = CuminStat(self, "producers")
         stat.title = "Producers"
         stat.unit = "producer"
-        stat.categories = ("general",)
         stat.highlow = True
 
         stat = CuminStat(self, "bindings")
         stat.title = "Bindings"
         stat.unit = "binding"
-        stat.categories = ("general",)
         stat.highlow = True
 
         stat = CuminStat(self, "msgReceives")
         stat.title = "Msgs. Received"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "msgRoutes")
         stat.title = "Msgs. Routed"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "msgDrops")
         stat.title = "Msgs. Dropped"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "byteReceives")
         stat.title = "Bytes Received"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "byteRoutes")
         stat.title = "Bytes Routed"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
         stat = CuminStat(self, "byteDrops")
         stat.title = "Bytes Dropped"
         stat.unit = "message"
-        stat.categories = ("message",)
+        stat.category = "io"
 
     def show_object(self, session, exchange):
         frame = self.cumin_model.show_main(session)
@@ -810,7 +799,6 @@
         stat = CuminStat(self, "msgMatched")
         stat.title = "Msgs. Matched"
         stat.unit = "message"
-        stat.categories = ("general",)
 
     def get_title(self, session):
         return "Binding"
@@ -827,27 +815,27 @@
 
         stat = CuminStat(self, "closing")
         stat.title = "Closing Down"
-        stat.categories = ("general",)
+        stat.category = "general"
 
         stat = CuminStat(self, "bytesFromClient")
         stat.title = "Bytes Sent"
         stat.unit = "byte"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "bytesToClient")
         stat.title = "Bytes Received"
         stat.unit = "byte"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "framesFromClient")
         stat.title = "Frames Sent"
         stat.unit = "frame"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "framesToClient")
         stat.title = "Frames Received"
         stat.unit = "frame"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         action = self.Close(self, "close")
         action.summary = True
@@ -894,16 +882,16 @@
 
         stat = CuminStat(self, "expireTime")
         stat.title = "Expiration"
-        stat.categories = ("general",)
+        stat.category = "general"
 
         stat = CuminStat(self, "framesOutstanding")
         stat.title = "Frames Outstanding"
         stat.unit = "frame"
-        stat.categories = ("general",)
+        stat.category = "general"
 
         stat = CuminStat(self, "attached")
         stat.title = "Attached"
-        stat.categories = ("general",)
+        stat.category = "general"
 
         self.Close(self, "close")
         self.Detach(self, "detach")
@@ -953,27 +941,26 @@
 
         stat = CuminStat(self, "closing")
         stat.title = "Closing Down"
-        stat.categories = ("general",)
 
         stat = CuminStat(self, "framesFromPeer")
         stat.title = "Frames from Peer"
         stat.unit = "frame"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "framesToPeer")
         stat.title = "Frames to Peer"
         stat.unit = "frame"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "bytesFromPeer")
         stat.title = "Bytes from Peer"
         stat.unit = "byte"
-        stat.categories = ("general",)
+        stat.category = "io"
 
         stat = CuminStat(self, "bytesToPeer")
         stat.title = "Bytes to Peer"
         stat.unit = "byte"
-        stat.categories = ("general",)
+        stat.category = "io"
 
     def get_title(self, session):
         return "Broker Link"

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/queue.py	2008-04-17 21:20:52 UTC (rev 1939)
@@ -440,7 +440,7 @@
         super(QueueStatsGeneral, self).__init__(app, name)
 
         self.add_child(StatSet(app, "general", "general"))
-        self.add_child(StatSet(app, "messages", "message"))
+        self.add_child(StatSet(app, "io", "io"))
 
         chart = self.EnqueueDequeueRateChart(app, "enqdeq")
         self.add_child(chart)
@@ -479,7 +479,7 @@
     def __init__(self, app, name):
         super(QueueStatsDurability, self).__init__(app, name)
 
-        self.add_child(StatSet(app, "messages", "persistent"))
+        self.add_child(StatSet(app, "io", "io.durable"))
 
         chart = self.EnqueueDequeueRateChart(app, "enqdeq")
         self.add_child(chart)
@@ -502,8 +502,8 @@
     def __init__(self, app, name):
         super(QueueStatsTransactions, self).__init__(app, name)
 
-        self.add_child(StatSet(app, "transactions", "transaction"))
-        self.add_child(StatSet(app, "messages", "transactional"))
+        self.add_child(StatSet(app, "transactions", "txn"))
+        self.add_child(StatSet(app, "io", "io.txn"))
 
         chart = self.EnqueueTransactionRateChart(app, "enqtxn")
         self.add_child(chart)

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/queue.strings	2008-04-17 21:20:52 UTC (rev 1939)
@@ -183,8 +183,8 @@
 <table class="twocol">
   <tr>
     <td>
-      <h2>Messages</h2>
-      {messages}
+      <h2>Input/Output</h2>
+      {io}
 
       <h2>General</h2>
       {general}
@@ -201,8 +201,8 @@
 <table class="twocol">
   <tr>
     <td>
-      <h2>Durable Messages</h2>
-      {messages}
+      <h2>Durable Input/Output</h2>
+      {io}
     </td>
     <td>
       {enqdeq}
@@ -217,8 +217,8 @@
       <h2>Transactions</h2>
       {transactions}
 
-      <h2>Transactional Messages</h2>
-      {messages}
+      <h2>Transactional Input/Output</h2>
+      {io}
     </td>
     <td>
       {enqtxn}

Modified: mgmt/cumin/python/cumin/stat.py
===================================================================
--- mgmt/cumin/python/cumin/stat.py	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/stat.py	2008-04-17 21:20:52 UTC (rev 1939)
@@ -31,7 +31,7 @@
         cls = self.app.model.get_class_by_object(object)
 
         for stat in cls.stats:
-            if self.category in stat.categories:
+            if self.category == stat.category:
                 stats.append((stat, object))
         
         return stats

Modified: mgmt/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/cumin/python/cumin/stat.strings	2008-04-17 20:32:38 UTC (rev 1938)
+++ mgmt/cumin/python/cumin/stat.strings	2008-04-17 21:20:52 UTC (rev 1939)
@@ -45,7 +45,7 @@
 table.StatSet {
   width: 100%;
   border-collapse: collapse;
-  margin: 0.5em 0.5em 1em 0.5em;
+  margin: 1em 0.5em;
 }
 
 table.StatSet tr {


    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging commits: r1939 - mgmt/cumin/python/cumin.