From 48ad0ab08d4762bade7fb91d2260ae5e7019851d Mon Sep 17 00:00:00 2001 From: Sahina Bose Date: Tue, 26 May 2015 11:47:31 +0530 Subject: nagios-config: Rename self-heal status plugin Renaming self-heal status plugin to split-brain status Change-Id: Icdb934904eda9c47ccdc4ba41a9204048918f0a9 Bug-Url: https://bugzilla.redhat.com/1221872 Signed-off-by: Sahina Bose Reviewed-on: http://review.gluster.org/10908 --- config/glustercluster.cfg.sample | 6 +++--- plugins/config_generator.py | 2 +- tests/test_config_generator.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/glustercluster.cfg.sample b/config/glustercluster.cfg.sample index 09f20ac..53f5ef9 100644 --- a/config/glustercluster.cfg.sample +++ b/config/glustercluster.cfg.sample @@ -127,17 +127,17 @@ define service{ } ################################################################################ -# This defines a Volume Self Heal status service +# This defines a Volume Split-brain status service # Edit this sample # host_name = the cluster host previously defined for cluster -# service_description = Volume Self-Heal - +# service_description = Volume Split-brain status - # check_command = check_vol_heal_status!! # _VOL_NAME = Volume name ################################################################################ define service{ use gluster-service-without-graph host_name test-cluster - service_description Volume Self-Heal - data-vol + service_description Volume Split-brain status - data-vol _VOL_NAME data-vol ; MUST DECLARE the custom var _VOL_NAME check_command check_vol_heal_status!test-cluster!data-vol } diff --git a/plugins/config_generator.py b/plugins/config_generator.py index ade3f8c..62c39ce 100644 --- a/plugins/config_generator.py +++ b/plugins/config_generator.py @@ -113,7 +113,7 @@ class GlusterNagiosConfManager: volumeService = {} volumeService['host_name'] = clusterName volumeService['use'] = 'gluster-service-without-graph' - serviceDesc = 'Volume Self-Heal - %s' % (volume['name']) + serviceDesc = 'Volume Split-brain status - %s' % (volume['name']) volumeService['service_description'] = serviceDesc volumeService[VOL_NAME] = volume['name'] checkCommand = 'check_vol_heal_status!%s!%s' % \ diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py index aa9db1b..5a0294e 100644 --- a/tests/test_config_generator.py +++ b/tests/test_config_generator.py @@ -102,10 +102,10 @@ class TestGlusterNagiosConfManager(TestCaseBase): serviceCount += 1 if 'REPLICATE' in volume['type']: - serviceDesc = 'Volume Self-Heal - %s' % (volume['name']) + serviceDesc = 'Volume Split-brain status - %s' % (volume['name']) service = self._findServiceInList(serviceList, serviceDesc) self.assertNotEqual(service, None, - "Volume Self-Heal service is not created") + "Volume Split-brain service is not created") serviceCount += 1 return serviceCount -- cgit