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

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 18f95d433b74df6c63a8a9621338b6803589f635
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Wed Feb 8 08:06:46 2012 +0100

    Added support for manubulon snmp plugins install

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index b3fe3fd..b871e97 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -161,6 +161,9 @@ export CHECKHPASM="http://labs.consol.de/wp-content/uploads/2011/10/check_hpasm-
 export CHECKHPASMAPTPKGS="snmp libnet-snmp-perl"
 export CHECKHPASMYUMPKGS="perl-Net-SNMP net-snmp"
 
+export MANUBULON="http://nagios.manubulon.com/nagios-snmp-plugins.1.1.1.tgz"
+export MANUBULONYUMPKG="perl-Net-SNMP"
+export MANUBULONAPTPKG="libsnmp-perl"
 
 ###################################
 ### TEXT PRESENTATION FUNCTIONS ### 
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 7e671a3..351f94d 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1343,7 +1343,7 @@ function install_nagios-plugins(){
         yum install -yq $NAGPLUGYUMPKG  >> /tmp/shinken.install.log 2>&1 
     else
         cecho " > Installing prerequisites" green 
-        apt-get -y install $NAGPLUGAPTPKG >> /tmp/shinken.install.log 2>&1 
+        DEBIAN_FRONTEND=noninteractive apt-get -y install $NAGPLUGAPTPKG #>> /tmp/shinken.install.log 2>&1 
     fi
     cd /tmp
     if [ ! -f "nagios-plugins-$NAGPLUGVERS.tar.gz" ]
@@ -1365,6 +1365,51 @@ function install_nagios-plugins(){
     
 }
 
+# MANUBULON SNMP PLUGINS 
+function install_manubulon(){
+    cadre "Install manubulon plugins" green
+
+    if [ "$CODE" == "REDHAT" ]
+    then
+        cecho " > Installing prerequisites" green
+        yum install -yq $MANUBULONYUMPKG  >> /tmp/shinken.install.log 2>&1 
+    else
+        cecho " > Installing prerequisites" green 
+        apt-get -y install $MANUBULONAPTPKG >> /tmp/shinken.install.log 2>&1 
+    fi
+    cd /tmp
+
+    # check if utils.pm is there
+    if [ ! -f $TARGET/libexec/utils.pm ]
+    then
+        cecho " > Unable to find utils.pm. You should install nagios-plugins first (./shinken.sh -p nagios-plugins)" red
+        exit 2
+    fi
+
+    archive=$(echo $MANUBULON | awk -F/ '{print $NF}')
+    folder=nagios_plugins
+    if [ ! -f "$archive" ]
+    then
+        cecho " > Getting manubulon archive" green
+        wget $WGETPROXY $MANUBULON >> /tmp/shinken.install.log 2>&1 
+    fi
+    cecho " > Extract archive content " green
+    if [ -d $folder ]
+    then
+        rm -Rf $folder 
+    fi
+    tar zxvf $archive >> /tmp/shinken.install.log 2>&1 
+    cd $folder 
+    cecho " > Relocate libs" green
+    for s in $(ls -1 /tmp/$folder/*.pl)
+    do
+        cecho " => Processing $s" green
+        sed -i "s#/usr/local/nagios/libexec#"$TARGET"/libexec#g" $s
+        cecho " => Installing $s" green
+        cp $s $TARGET/libexec
+    done
+}
+
 # CHECK_WMI_PLUS
 function install_check_wmi_plus(){
     cadre "Install check_wmi_plus" green
@@ -1574,6 +1619,7 @@ echo "Usage : shinken -k | -i | -w | -d | -u | -b | -r | -l | -c | -h | -a | -z
         check_emc_clariion
         check_nwc_health
         check_hpasm
+        manubulon (snmp plugins)
         capture_plugin
         pnp4nagios
         multisite
@@ -1633,6 +1679,10 @@ while getopts "kidubcr:lz:hsvp:we:" opt; do
             then
                 install_check_nwc_health
                 exit 0
+            elif [ "$OPTARG" == "manubulon" ]
+            then
+                install_manubulon
+                exit 0
             elif [ "$OPTARG" == "check_hpasm" ]
             then
                 install_check_hpasm

-- 
UNNAMED PROJECT