From ca79e5f512c3fc7fced5521043b292c9046d12f1 Mon Sep 17 00:00:00 2001 From: Ramesh Nachimuthu Date: Fri, 11 Apr 2014 09:52:43 +0530 Subject: autoconf: add brick/volume status service Adding services for brick and volume status in auto config Change-Id: Ic4a885f0b0f83294c21e9d8e0c22c720e0866a94 Signed-off-by: Ramesh Nachimuthu --- plugins/config_generator.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/config_generator.py b/plugins/config_generator.py index 02c5f67..6d725ef 100644 --- a/plugins/config_generator.py +++ b/plugins/config_generator.py @@ -120,6 +120,8 @@ class GlusterNagiosConfManager: volumeServices.append(volumeService) volumeService = self.__createVolumeQuotaStatusService(volume, clusterName) + volumeService = self.__createVolumeStatusService(volume, + clusterName) volumeServices.append(volumeService) return volumeServices @@ -127,19 +129,18 @@ class GlusterNagiosConfManager: brickService = {} brickService['use'] = 'brick-service' brickService['host_name'] = hostName - serviceDesc = "Brick-%s:%s" % (hostName, brick['brickpath']) + serviceDesc = "Brick Utilization - %s:%s" % (hostName, + brick['brickpath']) brickService['service_description'] = serviceDesc - brickService['display_name'] = serviceDesc brickService['_BRICK_DIR'] = brick['brickpath'] return brickService def __createBrickStatusService(self, brick, hostName): brickService = {} - brickService['use'] = 'brick-service' + brickService['use'] = 'gluster-passive-service' brickService['host_name'] = hostName - serviceDesc = "Brick-%s:%s-Status" % (hostName, brick['brickpath']) + serviceDesc = "Brick Status - %s:%s" % (hostName, brick['brickpath']) brickService['service_description'] = serviceDesc - brickService['display_name'] = serviceDesc brickService['_BRICK_DIR'] = brick['brickpath'] return brickService @@ -149,6 +150,9 @@ class GlusterNagiosConfManager: brickService = self.__createBrickUtilizationService( brick, host['hostip']) brickServices.append(brickService) + brickService = self.__createBrickStatusService( + brick, host['hostip']) + brickServices.append(brickService) return brickServices def generateNagiosConfigFromGlusterCluster(self, cluster): -- cgit