Only generate RabbitMQ failures against nodes.

Refs ZEN-5533.

README.rst

@@ -260,8 +260,14 @@ Screenshots
 Changes
 ===============================================================================
 
+
+1.0.6
+-------------------------------------------------------------------------------
+
+* (ZEN-5533) /Status/RabbitMQ for queues don't auto-clear when resolved
+
+
 1.0.5
 -------------------------------------------------------------------------------
 
-* Fixed "No data returned for command" event when no queues, connections or
-  channels exist.
+* (ZEN-3526) RabbitMQ: No data returned for command

ZenPacks/zenoss/RabbitMQ/parsers/RabbitMQCTL.py

@@ -52,6 +52,8 @@ def loadData(keys, expiration=1800):
 
 
 class RabbitMQCTL(CommandParser):
+    createDefaultEventUsingExitCode = False
+
     eventKey = eventClassKey = 'rabbitmq_node_status'
 
     event = None
@@ -65,23 +67,17 @@ def processResults(self, cmd, result):
             return
 
         # Get as much error handling out of the way right away.
-        if self.isError(cmd, result):
+        if not self.verifyResult(cmd, result):
             return
 
         # Route to the right parser based on the command.
-        if 'status' in cmd.command:
-            self.processStatusResults(cmd, result)
-        elif 'list_connections' in cmd.command:
+        if 'list_connections' in cmd.command:
             self.processListConnectionsResults(cmd, result)
         elif 'list_channels' in cmd.command:
             self.processListChannelsResults(cmd, result)
         elif 'list_queues' in cmd.command:
             self.processListQueuesResults(cmd, result)
 
-    def processStatusResults(self, cmd, result):
-        result.events.append(self.getEvent(
-            cmd, "node status is OK", clear=True))
-
     def processListConnectionsResults(self, cmd, result):
         connections = {}
 
@@ -236,31 +232,35 @@ def processListQueuesResults(self, cmd, result):
                 result.values.append((
                     point, queues[point.component][point.id]))
 
-    def isError(self, cmd, result):
-        match = re.search(r'^Error: (.+)$', cmd.result.output, re.MULTILINE)
-        if match:
-            result.events.append(self.getEvent(
-                cmd, match.group(1),
-                message=cmd.result.output))
+    def verifyResult(self, cmd, result):
+        clear = True
+        summary = 'status is OK'
+
+        if clear:
+            match = re.search(
+                r'^Error: (.+)$', cmd.result.output, re.MULTILINE)
 
-            return True
+            if match:
+                summary = match.group(1)
+                clear = False
 
-        match = re.search(r'command not found', cmd.result.output, re.MULTILINE)
-        if match:
-            result.events.append(self.getEvent(
-                cmd, "command not found: rabbitmqctl",
-                message=cmd.result.output))
+        if clear:
+            match = re.search(
+                r'command not found', cmd.result.output, re.MULTILINE)
 
-            return True
+            if match:
+                summary = 'command not found: rabbitmqctl'
+                clear = False
 
-        if cmd.result.exitCode != 0:
-            result.events.append(self.getEvent(
-                cmd, "rabbitmqctl error - see event message",
-                message=cmd.result.output))
+        if clear:
+            if cmd.result.exitCode != 0:
+                summary = 'rabbitmqctl error - see event message'
+                clear = False
 
-            return True
+        if 'status' in cmd.command:
+            result.events.append(self.getEvent(cmd, summary, clear=clear))
 
-        return False
+        return clear
 
     def getEvent(self, cmd, summary, message=None, clear=False):
         event = dict(

setup.py

@@ -3,7 +3,7 @@
 # or saved.  Do not modify them directly here.
 # NB: PACKAGES is deprecated
 NAME = "ZenPacks.zenoss.RabbitMQ"
-VERSION = "1.0.5"
+VERSION = "1.0.6"
 AUTHOR = "Zenoss Labs"
 LICENSE = "GPLv2"
 NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']