diff options
author | Kanagaraj M <kmayilsa@redhat.com> | 2014-05-07 23:43:01 +0530 |
---|---|---|
committer | Timothy Asir <tim.gluster@gmail.com> | 2014-05-08 01:10:17 -0700 |
commit | b87f9527515f27f145cc6b5cff1e68bab5cf2b21 (patch) | |
tree | 6ef1f358c59b15ba4d964f7711afb8454ff942e8 | |
parent | 4c63ceaf48a3641adb4e087125d6698fa857ad37 (diff) |
plugin: fix issue in smb monitoring
- changed the service name to 'SMB'
- changed the default value to 'disable'
Change-Id: I3b7a3b789495278e4b1de0a78e500994739d305a
Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
Reviewed-on: http://review.gluster.org/7701
Reviewed-by: Ramesh N <rnachimu@redhat.com>
Reviewed-by: Sahina Bose <sabose@redhat.com>
-rwxr-xr-x | plugins/check_gluster_proc_status.py | 2 | ||||
-rwxr-xr-x | plugins/check_proc_status.py | 2 | ||||
-rwxr-xr-x | plugins/check_proc_util.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/check_gluster_proc_status.py b/plugins/check_gluster_proc_status.py index bc15672..da719d4 100755 --- a/plugins/check_gluster_proc_status.py +++ b/plugins/check_gluster_proc_status.py @@ -24,7 +24,7 @@ from glusternagios import glustercli _NFS = "NFS" -_SMB = "CIFS" +_SMB = "SMB" _CTDB = "CTDB" _SHD = "SHD" _QUOTA = "QUOTA" diff --git a/plugins/check_proc_status.py b/plugins/check_proc_status.py index 8895b0f..bf3b077 100755 --- a/plugins/check_proc_status.py +++ b/plugins/check_proc_status.py @@ -32,7 +32,7 @@ from glusternagios import glustercli _nfsService = "NFS" _shdService = "Self-Heal" -_smbService = "CIFS" +_smbService = "SMB" _brickService = "Brick - %s" _glusterdService = "Gluster Management" _quotadService = "Quota" diff --git a/plugins/check_proc_util.py b/plugins/check_proc_util.py index 20f57eb..94d620b 100755 --- a/plugins/check_proc_util.py +++ b/plugins/check_proc_util.py @@ -131,9 +131,9 @@ def getSmbStatus(volInfo): # if smb is not running and any of the volume uses smb # then its required to alert the user for k, v in volInfo.iteritems(): - cifsStatus = v.get('options', {}).get('user.cifs', 'enable') - smbStatus = v.get('options', {}).get('user.smb', 'enable') - if cifsStatus == 'enable' and smbStatus == 'enable': + cifsStatus = v.get('options', {}).get('user.cifs', 'disable') + smbStatus = v.get('options', {}).get('user.smb', 'disable') + if cifsStatus == 'enable' or smbStatus == 'enable': msg = "CRITICAL: Process smb is not running" status = utils.PluginStatusCode.CRITICAL break |