From 0706780940a73ee38ea039f6c31e151ef106268a Mon Sep 17 00:00:00 2001
From: Kanagaraj M <kmayilsa@redhat.com>
Date: Mon, 5 May 2014 17:20:39 +0530
Subject: refactored service description for gluster services

service descriptions:
 - Gluster Management
 - NFS
 - Self-Heal
 - Quota
 - Brick - <brick_dir>

Change-Id: I3ece94ef61fcb3fd264e848508362375842dcc6f
Signed-off-by: Kanagaraj M <kmayilsa@redhat.com>
Reviewed-on: http://review.gluster.org/7671
Reviewed-by: Sahina Bose <sabose@redhat.com>
---
 config/gluster-host-services.cfg | 8 ++++----
 config/glustercluster.cfg.sample | 4 ++--
 plugins/check_vol_server.py      | 2 +-
 plugins/config_generator.py      | 2 +-
 tests/test_config_generator.py   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/gluster-host-services.cfg b/config/gluster-host-services.cfg
index 2e2dd30..fbcf9b9 100644
--- a/config/gluster-host-services.cfg
+++ b/config/gluster-host-services.cfg
@@ -47,7 +47,7 @@ define service{
 define service{
   use                   gluster-passive-service
   hostgroup_name        gluster_hosts
-  service_description   Gluster Management Daemon
+  service_description   Gluster Management
   normal_check_interval 1
   event_handler         host_service_handler
 }
@@ -55,7 +55,7 @@ define service{
 define service{
   use                   gluster-passive-service
   hostgroup_name        gluster_hosts
-  service_description   Gluster Quota Daemon
+  service_description   Quota
   normal_check_interval 1
   event_handler         host_service_handler
 }
@@ -63,7 +63,7 @@ define service{
 define service{
   use                   gluster-passive-service
   hostgroup_name        gluster_hosts
-  service_description   Glusterfs NFS Daemon
+  service_description   NFS
   normal_check_interval 1
   event_handler         host_service_handler
 }
@@ -71,7 +71,7 @@ define service{
 define service{
   use                   gluster-passive-service
   hostgroup_name        gluster_hosts
-  service_description   Glusterfs Self-Heal Daemon
+  service_description   Self-Heal
   normal_check_interval 1
   event_handler         host_service_handler
 }
diff --git a/config/glustercluster.cfg.sample b/config/glustercluster.cfg.sample
index e8d73c1..09f20ac 100644
--- a/config/glustercluster.cfg.sample
+++ b/config/glustercluster.cfg.sample
@@ -66,14 +66,14 @@ define service {
 # This defines a Brick Status service
 # Edit this sample
 #    host_name = host the brick is on
-#    service_description = Brick Status - <brickdir>
+#    service_description = Brick - <brickdir>
 #    _BRICK_DIR = Path to brick on server
 #    _VOL_NAME  = Volume name the brick is part of
 ################################################################################
 define service {
   use                   brick-passive-service
   host_name             host.ipaddress1
-  service_description   Brick Status - /bricks/b1
+  service_description   Brick - /bricks/b1
   _BRICK_DIR            /bricks/b1 ; MUST DECLARE the custom var _BRICK_DIR
   _VOL_NAME             Vol-1
 }
diff --git a/plugins/check_vol_server.py b/plugins/check_vol_server.py
index dee00c2..cab903c 100755
--- a/plugins/check_vol_server.py
+++ b/plugins/check_vol_server.py
@@ -69,7 +69,7 @@ def _getVolumeStatusOutput(args):
             "GET services\n"
             "Filter: host_groups >= %s\n"
             "Filter: custom_variable_values >= %s\n"
-            "Filter: description ~ Brick Status - \n"
+            "Filter: description ~ Brick - \n"
             "Stats: state = 0\n"
             "Stats: state = 2\n"
             % (args.hostgroup, args.volume))
diff --git a/plugins/config_generator.py b/plugins/config_generator.py
index d380f82..e32a877 100644
--- a/plugins/config_generator.py
+++ b/plugins/config_generator.py
@@ -183,7 +183,7 @@ class GlusterNagiosConfManager:
         brickService = {}
         brickService['use'] = 'gluster-brick-passive-service'
         brickService['host_name'] = hostName
-        serviceDesc = "Brick Status - %s" % brick['brickpath']
+        serviceDesc = "Brick - %s" % brick['brickpath']
         brickService['service_description'] = serviceDesc
         brickService['_BRICK_DIR'] = brick['brickpath']
         brickService['_VOL_NAME'] = brick['volumeName']
diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py
index e0fd8bc..9d6d1ab 100644
--- a/tests/test_config_generator.py
+++ b/tests/test_config_generator.py
@@ -45,7 +45,7 @@ class TestGlusterNagiosConfManager(TestCaseBase):
 
     def _verifyHostServices(self, hostConfig, hostData):
         for brick in hostData['bricks']:
-            serviceDesc = "Brick Status - %s" % brick['brickpath']
+            serviceDesc = "Brick - %s" % brick['brickpath']
             service = self._findServiceInList(hostConfig['host_services'],
                                               serviceDesc)
             self.assertNotEqual(service, None,
-- 
cgit