[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

David GUENAULT dguenault at monitoring-fr.org
Tue Feb 28 22:14:09 UTC 2012


The following commit has been merged in the debian/master branch:
commit 0856744ed608e666205c9041b61c7166a482979e
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Jan 15 11:11:35 2012 +0100

    Added support for check_emc_clariion plugin

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index cdf9b36..245e3c3 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -78,17 +78,17 @@ if [ "$CODE" = "REDHAT" ]
 then
 	if [ "$VERS" = "5" ]
 	then
-		export YUMPKGS="gcc python26 sqlite-devel python26-devel git mysql-devel nmap wget"
+		export YUMPKGS="gcc python26 sqlite-devel python26-devel git mysql-devel nmap wget unzip"
 	fi
 
 	if [ "$VERS" = "6" ]
 	then
-		export YUMPKGS="gcc python sqlite-devel python-devel git mysql-devel python-setuptools nmap wget"
+		export YUMPKGS="gcc python sqlite-devel python-devel git mysql-devel python-setuptools nmap wget unzip"
 	fi
 fi
 export SETUPTOOLSVERS="0.6c11"
 export RHELSETUPTOOLS="http://pypi.python.org/packages/source/s/setuptools/setuptools-$SETUPTOOLSVERS.tar.gz"
-export APTPKGS="build-essential libperl-dev python-setuptools libsqlite3-dev python-dev pyro sqlite3 nmap"
+export APTPKGS="build-essential libperl-dev python-setuptools libsqlite3-dev python-dev pyro sqlite3 nmap unzip"
 export PYLIBSRHEL="paramiko:paramiko netifaces:netifaces multiprocessing:multiprocessing simplejson:simplejson pysqlite:sqlite3 MySQL-python:MySQLdb pyro:Pyro.core"
 export PYLIBSRHEL6="paramiko:paramiko netifaces:netifaces simplejson:simplejson pysqlite:sqlite3 MySQL-python:MySQLdb pyro:Pyro.core"
 export PYLIBSDEB="paramiko:paramiko netifaces:netifaces pyro:Pyro.core simplejson:simplejson pysqlite:sqlite MySQL-python:MySQLdb"
@@ -98,6 +98,7 @@ export VSPHERESDKAPTPKGS="libssl-dev perl-doc liburi-perl libxml-libxml-perl lib
 export VSPHERESDKYUMPKGS="openssl-devel perl-URI perl-XML-LibXML perl-Crypt-SSLeay perl-SOAP-Lite perl-Class-MethodMaker uuid-perl make perl-libwww-perl.noarch" 
 export NAGPLUGYUMPKGS="perl-Class-Accessor perl-Config-Tiny perl-Math-Calc-Units perl-Params-Validate"
 export NAGPLUGPERL="http://search.cpan.org/CPAN/authors/id/T/TO/TONVOON/Nagios-Plugin-0.36.tar.gz"
+
 export VSPHERESDKVER="4.0.0-161974"
 export VSPHERESDK="http://www.shinken-monitoring.org/archives/VMware-vSphere-SDK-for-Perl-$VSPHERESDKVER.$ARCH.tar.gz"
 export CHECK_ESX3_SCRIPT="http://git.op5.org/git/?p=nagios/op5plugins.git;a=blob_plain;f=check_esx3.pl;hb=HEAD"
@@ -107,7 +108,6 @@ export NAGPLUGBASEURI="http://downloads.sourceforge.net/project/nagiosplug/nagio
 export NAGPLUGAPTPKG="libgnutls-dev libmysqlclient-dev libssl-dev libsnmp-perl libkrb5-dev libldap2-dev libsnmp-dev libnet-snmp-perl gawk libwrap0-dev libmcrypt-dev fping snmp gettext smbclient dnsutils"
 export NAGPLUGYUMPKG="gnutls-devel mysql-devel openssl-devel net-snmp-perl krb5-devel openldap-devel net-snmp-devel gawk libmcrypt-devel fping net-snmp gettext samba-client"
 
-
 export CHECKORACLEHEALTHAPTPKG="libdbi-perl libaio1"
 export CHECKORACLEHEALTHYUMPKG="perl-DBI libaio"
 export CHECKORACLEHEALTHCPAN="http://search.cpan.org/CPAN/authors/id/P/PY/PYTHIAN/DBD-Oracle-1.36.tar.gz"
@@ -117,6 +117,10 @@ export CHECKMONGOAPTPKG="python-pymongo"
 export CHECKMONGOYUMPKG="pymongo"
 export CHECKMONGO="https://raw.github.com/mzupan/nagios-plugin-mongodb/master/check_mongodb.py"
 
+export CHECKEMCAPTPKG=""
+export CHECKEMCYUMPKG=""
+export CHECKEMC="https://www.netways.org/attachments/download/393/check_emc.zip"
+
 export CHECKMYSQLHEALTH="http://labs.consol.de/wp-content/uploads/2011/08/check_mysql_health-2.1.7.tar.gz"
 export CHECKMYSQLHEALTHYUMPKG="perl-Time-HiRes"
 
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 190b695..1a7c641 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1059,6 +1059,7 @@ echo "Usage : shinken -k | -i | -w | -d | -u | -b | -r | -l | -c | -h | -a | -z
         check_mysql_health
         check_wmi_plus
         check_mongodb
+        check_emc_clariion
         capture_plugin
         pnp4nagios
         multisite
@@ -1252,11 +1253,71 @@ function install_check_mongodb(){
 		fi
 	fi
 
+    cecho " > Installing check_mongodb.py" green
 	mv check_mongodb.py $TARGET/libexec/check_mongodb.py
 	chmod +x $TARGET/libexec/check_mongodb.py	
 	chown $SKUSER:$SKGROUP $TARGET/libexec/check_mongodb.py
 		
 }
+
+# check_emc_clariion
+
+function install_check_emc_clariion(){
+
+	cadre "Install check_emc_clariion plugin from netways" green
+
+    cecho " You will need the DELL/EMC Navisphere agent in order to use this
+plugin. Ask your vendor to know how to get it." yellow
+    cecho " You should also customize the navisphere agent path in the plugin" yellow
+    read taste
+
+	if [ "$CODE" == "REDHAT" ]
+	then
+		cecho " > installing prerequisites" green 
+		yum install -yq $CHECKEMCYUMPKG  >> /tmp/shinken.install.log 2>&1 
+	else
+		cecho " > installing prerequisites" green 
+		apt-get -y install $CHECKEMCAPTPKG >> /tmp/shinken.install.log 2>&1 
+	fi
+
+    if [ $? -ne 0 ]
+    then
+        cecho " > Error while installing prerequisites" red
+        exit 2
+    fi
+
+	cd /tmp
+
+	if [ ! -f "/tmp/check_emc.zip" ]
+	then
+		cecho " > Downloading check_emc.zip" green
+		wget $WGETPROXY $CHECKEMC  >> /tmp/shinken.install.log 2>&1 	
+		if [ $? -ne 0 ]
+		then
+			cecho " > Error while downloading check_emc.zip" red
+			exit 2
+		fi
+	fi
+
+    cecho " > Extract check_emc.zip" green
+    if [ -d check_emc ] 
+    then 
+        rm -Rf check_emc
+    fi
+    unzip check_emc.zip >> /tmp/shinken.install.log 2>&1
+    if [ $? -ne 0 ]
+    then
+        cecho " > Error while trying to extract check_emc.zip" red
+        exit 2
+    fi
+  
+    cecho " > Install check_emc_clariion.pl" green 
+    cd check_emc 
+	mv check_emc_clariion.pl $TARGET/libexec/
+	chmod +x $TARGET/libexec/check_emc_clariion.pl	
+	chown $SKUSER:$SKGROUP $TARGET/libexec/check_emc_clariion.pl
+}
+
 # check_esx3
 
 function install_check_esx3(){
@@ -1588,6 +1649,10 @@ while getopts "kidubcr:lz:hsvp:we:" opt; do
 			then
 				install_check_mongodb
 				exit 0
+			elif [ "$OPTARG" == "check_emc_clariion" ]
+			then
+				install_check_emc_clariion
+				exit 0
 			elif [ "$OPTARG" == "pnp4nagios" ]
 			then
 				install_pnp4nagios

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list