Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Messages throughput graph should be packets.

Fixes #8.
  • Loading branch information...
commit 256ee55e83e00a635ab747beb83486af0bf8b337 1 parent 5f1ceaa
Chet Luther cluther authored
14 ZenPacks/zenoss/RabbitMQ/__init__.py
View
@@ -52,9 +52,23 @@ class ZenPack(ZenPackBase):
"""
def install(self, app):
+ self.pre_install(app)
super(ZenPack, self).install(app)
self._buildDeviceRelations()
+ def pre_install(self, app):
+ # Remove the "Throughput - Messages" graph so it can be replaced with
+ # the proper packets graph from objects.xml.
+ node_template = app.zport.dmd.Devices.rrdTemplates._getOb(
+ 'RabbitMQNode', None)
+
+ if node_template:
+ messages_graph = node_template.graphDefs._getOb(
+ 'Throughput - Messages', None)
+
+ if messages_graph:
+ node_template.graphDefs._delObject(messages_graph.id)
+
def remove(self, app, leaveObjects=False):
if not leaveObjects:
# Remove our Device relations additions.
34 ZenPacks/zenoss/RabbitMQ/objects/objects.xml
View
@@ -314,6 +314,9 @@ True
</property>
<tomanycont id='graphPoints'>
<object id='Consumers' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -424,6 +427,9 @@ False
<property type="boolean" id="hasSummary" mode="w" >
True
</property>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<tomanycont id='graphPoints'>
<object id='Channels' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
<property type="long" id="sequence" mode="w" >
@@ -455,6 +461,9 @@ AVERAGE
</property>
</object>
<object id='Connections' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -512,6 +521,9 @@ True
</property>
<tomanycont id='graphPoints'>
<object id='Queue' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -598,6 +610,9 @@ AVERAGE
</property>
</object>
<object id='Sent' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -625,7 +640,7 @@ AVERAGE
</object>
</tomanycont>
</object>
-<object id='Throughput - Messages' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
+<object id='Throughput - Packets' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
<property type="int" id="height" mode="w" >
100
</property>
@@ -633,7 +648,7 @@ AVERAGE
500
</property>
<property type="string" id="units" mode="w" >
-messages/sec
+packets/sec
</property>
<property type="boolean" id="log" mode="w" >
False
@@ -684,6 +699,9 @@ AVERAGE
</property>
</object>
<object id='Sent' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -898,6 +916,9 @@ True
</property>
<tomanycont id='graphPoints'>
<object id='Consumers' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
LINE
</property>
@@ -955,6 +976,9 @@ True
</property>
<tomanycont id='graphPoints'>
<object id='Used' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
AREA
</property>
@@ -1007,6 +1031,9 @@ False
<property type="boolean" id="hasSummary" mode="w" >
True
</property>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<tomanycont id='graphPoints'>
<object id='Ready' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
<property type="long" id="sequence" mode="w" >
@@ -1038,6 +1065,9 @@ AVERAGE
</property>
</object>
<object id='Threshold - Messages (Max)' module='Products.ZenModel.ThresholdGraphPoint' class='ThresholdGraphPoint'>
+<property type="long" id="sequence" mode="w" >
+0
+</property>
<property type="string" id="threshId" mode="w" >
queue size
</property>
2  setup.py
View
@@ -3,7 +3,7 @@
# or saved. Do not modify them directly here.
# NB: PACKAGES is deprecated
NAME = "ZenPacks.zenoss.RabbitMQ"
-VERSION = "1.0.0"
+VERSION = "1.0.1"
AUTHOR = "Zenoss Labs"
LICENSE = ""
NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']
Please sign in to comment.
Something went wrong with that request. Please try again.