2018-02-28: FG; Added Dell MD38XX template, adjusted default time interval.

Dell_MD38XX/Script/zbxDellStorageDeviceStatus.sh

@@ -46,9 +46,9 @@ Options:
   -p PATHBIN, --path=PATHBIN
                         Full path of SMcli executable
 
-  -r, --raid String     Name (or IP of one of the controllers) of the Storage Array
+  -r, --raid=String     Name (or IP of one of the controllers) of the Storage Array
 
-  -w, --want String1[,String2[,String3]]
+  -w, --want=String1[,String2[,String3]]
                         List of words identifying storage objects
                         to query information for. Defaults to 
                         Storage,RAID,Disk
@@ -56,7 +56,7 @@ Options:
 
   -i TIME, --interval=ITIME
                         Number of seconds to accumulate data for,
-                        default is 3
+                        default is 5
 
   -z ZABBIXSERVER, --zabbixserver=ZABBIXSERVER
                         Hostname or IP address of Zabbix server
@@ -96,16 +96,14 @@ Options:
 }
 
 # Define some default values
-HOST=localhost
-PORT=80
-PROTO=http
 ZABBIXSERVER=localhost
 SENDER=/usr/bin/zabbix_sender
 DEBUG=0
 TEST=1
 ZABBIXPORT=10051
 ZABBIXSOURCE=localhost
-MONINTERVAL=3
+CHECKSYNTAX="-e"
+MONINTERVAL=5
 PATHBIN=""
 SUDOCMD=`which sudo`
 TIMEOUT=30
@@ -147,7 +145,7 @@ while true; do
             exit 0
             ;;
         -e|--check)
-            CHECKSYNTAX="-e"
+            CHECKSYNTAX=""
             shift
             ;;
         -p|--path)

Dell_MD38XX/Script/zbxDellStorageDiscover.sh

@@ -69,7 +69,8 @@ Options:
 HOST=localhost
 DEBUG=0
 TEST=1
-MONINTERVAL=1
+CHECKSYNTAX="-e"
+MONINTERVAL=3
 PATHBIN=""
 SUDOCMD=`which sudo`
 SHOWDEV=0
@@ -94,7 +95,7 @@ while true; do
             exit 0
             ;;
         -e|--check)
-            CHECKSYNTAX="-e"
+            CHECKSYNTAX=""
             shift
             ;;
         -p|--path)
@@ -189,7 +190,7 @@ if [[ $RET_VAL = 0 ]]; then
 
 	if [[ $SHOWDEV = 1 ]]; then
 	    STATUSFILE=`mktemp`
-	    GET_CMD="$SUDOCMD $PATHBIN $raidList $CHECKSYNTAX -c 'set session performanceMonitorInterval=3 performanceMonitorIterations=1 ; save storageArray performanceStats file=\"$STATUSFILE\";' > /dev/null"
+	    GET_CMD="$SUDOCMD $PATHBIN $raidList $CHECKSYNTAX -c 'set session performanceMonitorInterval=${MONINTERVAL} performanceMonitorIterations=1 ; save storageArray performanceStats file=\"$STATUSFILE\";' > /dev/null"
 	    if [[ $DEBUG = 1 ]]; then
 		echo -n -e "\n########################################\n"
 		echo -n -e "Command line to collect data\n"