From 6759965ca3df5aca51c248a016688646e63497fc Mon Sep 17 00:00:00 2001 From: Darshan N Date: Thu, 2 Jul 2015 12:40:49 +0530 Subject: nagios-addons: added disperse vol details to discover_volumes plugin This patch adds disperse volume related details like redundancy count and disperse count to discover_volumes plugin. It is needed to monitor status of disperse volume. Change-Id: I1c5d7d85e6fe7b0efdcd75fd562507dd1f9ce906 Bug-Url: https://bugzilla.redhat.com/1235651 Signed-off-by: Darshan N Reviewed-on: http://review.gluster.org/11500 Reviewed-by: Ramesh N Reviewed-by: Sahina Bose --- plugins/discover_volumes.py | 2 ++ tests/test_discover_volumes.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/discover_volumes.py b/plugins/discover_volumes.py index c175247..e8633e0 100755 --- a/plugins/discover_volumes.py +++ b/plugins/discover_volumes.py @@ -75,6 +75,8 @@ def discoverVolumes(volumeName, list): volDict['replicaCount'] = volume['replicaCount'] volDict['bricks'] = [] + volDict['disperseCount'] = volume['disperseCount'] + volDict['redundancyCount'] = volume['redundancyCount'] for brick in volume['bricksInfo']: brickproplist = brick['name'].split(':') volDict['bricks'].append({'brickaddress': brickproplist[0], diff --git a/tests/test_discover_volumes.py b/tests/test_discover_volumes.py index e5d15b7..b10dd56 100644 --- a/tests/test_discover_volumes.py +++ b/tests/test_discover_volumes.py @@ -29,11 +29,13 @@ class TestDiscoverVolumes(TestCaseBase): result['V1'] = {"bricksInfo": [{"name": "172.16.53.1:/bricks/v1-1", "hostUuid": "0000-1111"}], "volumeType": "DISTRIBUTE", "volumeName": "V1", - "replicaCount": "1"} + "replicaCount": "1", "disperseCount": "4", + "redundancyCount": "2"} result['V2'] = {"bricksInfo": [{"name": "172.16.53.2:/bricks/v2-1", "hostUuid": "0000-1112"}], "volumeType": "DISTRIBUTE", "volumeName": "V2", - "replicaCount": "1"} + "replicaCount": "1", "disperseCount": "4", + "redundancyCount": "2"} return result def _mockGetVolumeInfo(self, volumeName): -- cgit