From ab257f71eaf7ee61859ba54af36e1725adb6df8d Mon Sep 17 00:00:00 2001
From: Timothy Asir <tjeyasin@redhat.com>
Date: Wed, 16 Apr 2014 23:42:27 +0530
Subject: Use hostname from the config for sending proc status thru nsca

fetch the hostname from nagios_server.conf file
otherwise use the host-fqdn name for sending proc status
thru nsca. And fix the check_proc_status plugin path
in cron.d/gluster-proc.crontab file.

Change-Id: Ibfc027742b58d87daa7e54aa553892d42c71e795
Signed-off-by: Timothy Asir <tjeyasin@redhat.com>
---
 config/nagios_server.conf    | 6 ++++++
 plugins/check_proc_status.py | 6 +++---
 plugins/gluster-proc.crontab | 2 +-
 plugins/nscautils.py.in      | 6 ++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/config/nagios_server.conf b/config/nagios_server.conf
index 56c8995..381e588 100644
--- a/config/nagios_server.conf
+++ b/config/nagios_server.conf
@@ -11,3 +11,9 @@ nagios_server=
 [NAGIOS-DEFINTIONS]
 cluster_name=
 
+
+# LOCAL HOST NAME
+# Host name given in the nagios server
+[HOST-NAME]
+hostname_in_nagios=
+
diff --git a/plugins/check_proc_status.py b/plugins/check_proc_status.py
index 80a41c8..20b7b32 100755
--- a/plugins/check_proc_status.py
+++ b/plugins/check_proc_status.py
@@ -166,9 +166,9 @@ def sendShdStatus(hostName, volInfo):
 
 
 if __name__ == '__main__':
-    #Get the volume status
-    #status = 0
-    hostName = socket.getfqdn()
+    hostName = nscautils.getCurrentHostNameInNagiosServer()
+    if not hostName:
+        hostName = socket.getfqdn()
     if hostName == "localhost.localdomain" or hostName == "localhost":
         sys.stderr.write("failed to find localhost fqdn")
 
diff --git a/plugins/gluster-proc.crontab b/plugins/gluster-proc.crontab
index 7344ea2..9febe26 100644
--- a/plugins/gluster-proc.crontab
+++ b/plugins/gluster-proc.crontab
@@ -1 +1 @@
-*/1 * * * * root /usr/lib64/nagios/gluster/plugins/check_proc_status.py
+*/1 * * * * root /usr/lib64/nagios/plugins/gluster/check_proc_status.py
diff --git a/plugins/nscautils.py.in b/plugins/nscautils.py.in
index 10247e2..6ad96f5 100644
--- a/plugins/nscautils.py.in
+++ b/plugins/nscautils.py.in
@@ -31,6 +31,12 @@ def getNagiosServerIP():
     return config.get('NAGIOS-SERVER', 'nagios_server')
 
 
+def getCurrentHostNameInNagiosServer():
+    config = ConfigParser.ConfigParser()
+    config.read(__NAGIOSSERVER_CONF)
+    return config.get('HOST-NAME', 'hostname_in_nagios')
+
+
 def getNagiosClusterName():
     config = ConfigParser.ConfigParser()
     config.read(__NAGIOSSERVER_CONF)
-- 
cgit