diff options
author | Sahina Bose <sabose@redhat.com> | 2014-04-16 11:48:35 +0530 |
---|---|---|
committer | Bala.FA <barumuga@redhat.com> | 2014-04-29 10:14:33 +0530 |
commit | e5c38e4d2411d453a769fd5acda2bee97d9237d9 (patch) | |
tree | 8d698b5d8b28769d693eddf25cea633a17df60ae | |
parent | 8faeb444a587fb36fa7605d85b3a2f68b416af17 (diff) |
plugins: Fixed errors in syslog plugin
Added a requires on nsca and fixed the errors
on calling syslog plugin
Change-Id: I310a6a8aa64042a290d45207f78cf1d1d2b3b09b
Signed-off-by: Sahina Bose <sabose@redhat.com>
-rw-r--r-- | config/glusternagios.conf.in | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | gluster-nagios-addons.spec.in | 1 | ||||
-rwxr-xr-x | plugins/check_gluster_syslog.py | 3 | ||||
-rw-r--r-- | plugins/nscautils.py.in | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/config/glusternagios.conf.in b/config/glusternagios.conf.in index 004b375..1327c31 100644 --- a/config/glusternagios.conf.in +++ b/config/glusternagios.conf.in @@ -8,7 +8,7 @@ $actionomprogbinary @glusternagiospluginsdir@/check_gluster_syslog.py # $template GLFS_NAG_Template,"%msgid%/%syslogfacility-text:::uppercase%/%syslogseverity-text:::uppercase%/%app-name:::uppercase% [%TIMESTAMP:::date-rfc3339%] %msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" -if $app-name contains 'glusterfsd' then :omprog:;GLFS_NAG_Template +if ($app-name contains 'glusterfsd' or $programname startswith 'bricks') and not ($msg contains '@cee') then :omprog:;GLFS_NAG_Template # diff --git a/configure.ac b/configure.ac index dffb3ea..6d3c6c7 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ AC_SUBST([NAGIOSGROUP], [nagios]) # default paths AC_SUBST([nagiospluginsdir], ['${libdir}/nagios/plugins']) -AC_SUBST([glusternagiospluginsdir], ['${nagiospluginsdir}/gluster']) +AC_SUBST([glusternagiospluginsdir], ['/usr/lib64/nagios/plugins/gluster']) AC_SUBST([glusternagioscommonpylibdir], ['${pyexecdir}/glusternagios']) AC_SUBST([glusternagiosaddonstestsdir], ['${datarootdir}/${PACKAGE_NAME}/tests']) AC_SUBST([nagiosconf], ['/etc/nagios']) diff --git a/gluster-nagios-addons.spec.in b/gluster-nagios-addons.spec.in index f95d71e..190d2e7 100644 --- a/gluster-nagios-addons.spec.in +++ b/gluster-nagios-addons.spec.in @@ -66,6 +66,7 @@ Requires: gluster-nagios-common Requires: libselinux-python Requires: nagios-plugins-ide_smart Requires: nrpe +Requires: nsca-client Requires: python-argparse Requires: python-ethtool Requires: python-inotify diff --git a/plugins/check_gluster_syslog.py b/plugins/check_gluster_syslog.py index a52667c..277f32f 100755 --- a/plugins/check_gluster_syslog.py +++ b/plugins/check_gluster_syslog.py @@ -62,9 +62,6 @@ def processMsg(msg): 'Check if msg is indeed from gluster app' custom_logvars = msg[:msg.find(' ')] level = custom_logvars.split('/')[2] - appname = custom_logvars.split('/')[3] - if appname != 'GLUSTERFSD': - return # For gluster messages, need to check the source of message logsource = msg[msg.rfind('['):msg.rfind(']')] if logsource.find('quota') > -1: diff --git a/plugins/nscautils.py.in b/plugins/nscautils.py.in index 289d0d1..10247e2 100644 --- a/plugins/nscautils.py.in +++ b/plugins/nscautils.py.in @@ -43,7 +43,7 @@ def send_to_nsca(hostName, serviceName, exitStatus, resultString): exitStatus, resultString) nagiosIP = getNagiosServerIP() - command_send_nsca = [__NSCA_CMD_PATH, '-H', nagiosIP, + command_send_nsca = [__NSCA_CMD_PATH.cmd, '-H', nagiosIP, '-c', __NSCA_CONF_PATH] ret, out, err = utils.execCmd(command_send_nsca, data=cmddata) return ret |