From 19b6b3452546c5e9fe037eaa7121c810d45c4047 Mon Sep 17 00:00:00 2001
From: Timothy Asir <tjeyasin@redhat.com>
Date: Fri, 9 May 2014 15:40:47 +0530
Subject: resend gluster proc status to nagios on any status message change

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1096620
Change-Id: I8b7b3f11426c2c6841165cb05740cd9bbfc24195
Signed-off-by: Timothy Asir <tjeyasin@redhat.com>
Reviewed-on: http://review.gluster.org/7774
Tested-by: Timothy Asir <tim.gluster@gmail.com>
Reviewed-by: Sahina Bose <sabose@redhat.com>
---
 plugins/check_proc_status.py | 52 +++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugins/check_proc_status.py b/plugins/check_proc_status.py
index bf3b077..8fd3f3a 100755
--- a/plugins/check_proc_status.py
+++ b/plugins/check_proc_status.py
@@ -58,6 +58,20 @@ def getBrickStatus(volInfo):
     return bricks
 
 
+class Status():
+    def __init__(self, code=None, message=None):
+        self.code = code
+        self.message = message
+
+    def isStatusChanged(self, code, message):
+        if (self.code, self.message) != (code, message) or \
+           code == utils.PluginStatusCode.CRITICAL:
+            self.code = code
+            self.message = message
+            return True
+        return False
+
+
 class App():
     def __init__(self):
         self.stdin_path = '/dev/null'
@@ -69,12 +83,12 @@ class App():
     def run(self):
         hostName = nscautils.getCurrentHostNameInNagiosServer()
         sleepTime = int(nscautils.getProcessMonitorSleepTime())
-        glusterdStatus = None
-        nfsStatus = None
-        smbStatus = None
-        shdStatus = None
-        quotaStatus = None
-        ctdbStatus = None
+        glusterdStatus = Status()
+        nfsStatus = Status()
+        smbStatus = Status()
+        shdStatus = Status()
+        quotaStatus = Status()
+        ctdbStatus = Status()
         brickStatus = {}
         while True:
             if not hostName:
@@ -84,9 +98,7 @@ class App():
                     time.sleep(sleepTime)
                     continue
             status, msg = check_proc_util.getGlusterdStatus()
-            if status != glusterdStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                glusterdStatus = status
+            if glusterdStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _glusterdService, status, msg)
 
             # Get the volume status only if glusterfs is running to avoid
@@ -104,39 +116,29 @@ class App():
                 continue
 
             status, msg = check_proc_util.getNfsStatus(volInfo)
-            if status != nfsStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                nfsStatus = status
+            if nfsStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _nfsService, status, msg)
 
             status, msg = check_proc_util.getSmbStatus(volInfo)
-            if status != smbStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                smbStatus = status
+            if smbStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _smbService, status, msg)
 
             status, msg = check_proc_util.getCtdbStatus(smbStatus, nfsStatus)
-            if status != ctdbStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                ctdbStatus = status
+            if ctdbStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _ctdbdService, status, msg)
 
             status, msg = check_proc_util.getShdStatus(volInfo)
-            if status != shdStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                shdStatus = status
+            if shdStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _shdService, status, msg)
 
             status, msg = check_proc_util.getQuotadStatus(volInfo)
-            if status != quotaStatus or \
-                    status == utils.PluginStatusCode.CRITICAL:
-                quotaStatus = status
+            if quotaStatus.isStatusChanged(status, msg):
                 nscautils.send_to_nsca(hostName, _quotadService, status, msg)
 
             brick = getBrickStatus(volInfo)
             # brickInfo contains status, and message
             for brickService, brickInfo in brick.iteritems():
-                if brickInfo[0] != brickStatus.get(brickService, [None])[0] \
+                if brickInfo != brickStatus.get(brickService, [None]) \
                    or brickInfo[0] == utils.PluginStatusCode.CRITICAL:
                     brickStatus[brickService] = brickInfo
                     nscautils.send_to_nsca(hostName, brickService,
-- 
cgit