Update powerwall.sh
This commit is contained in:
14
powerwall.sh
14
powerwall.sh
@@ -33,7 +33,6 @@ CHECKTEMP(){
|
|||||||
if [ "${1}" == "" ] || [[ "${SENSOR}" = *"${1}"* ]] || [ "${1}" == "noavg" ] || [[ "${1}" =~ ^[0-9]+$ ]]; then
|
if [ "${1}" == "" ] || [[ "${SENSOR}" = *"${1}"* ]] || [ "${1}" == "noavg" ] || [[ "${1}" =~ ^[0-9]+$ ]]; then
|
||||||
|
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then
|
if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then
|
||||||
[ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
|
|
||||||
vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
|
vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
|
||||||
vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]}
|
vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]}
|
||||||
vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]}
|
vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]}
|
||||||
@@ -221,8 +220,7 @@ CHECKTEMP_SERVICE(){
|
|||||||
rm -f ${PW_TMPFOLDER}/${SENSORa}.down
|
rm -f ${PW_TMPFOLDER}/${SENSORa}.down
|
||||||
|
|
||||||
fi
|
fi
|
||||||
[ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" != "false" ]; then
|
|
||||||
vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
|
vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
|
||||||
unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
|
unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
|
||||||
|
|
||||||
@@ -240,9 +238,6 @@ CHECKTEMP_SERVICE(){
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elif [ "${RACADMONLINE}" == "false" ]; then
|
|
||||||
SENSORS_CHECK=''
|
|
||||||
|
|
||||||
else
|
else
|
||||||
SENSORS_CHECK=(${SENSORa})
|
SENSORS_CHECK=(${SENSORa})
|
||||||
fi
|
fi
|
||||||
@@ -460,12 +455,9 @@ DAILYTEMP(){
|
|||||||
echo -e "Sensor Temperature(s) Now / 1DayAVG / 7DayAVG"
|
echo -e "Sensor Temperature(s) Now / 1DayAVG / 7DayAVG"
|
||||||
DIVIDER . . 60
|
DIVIDER . . 60
|
||||||
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
||||||
[ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" != "false" ]; then
|
vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
|
||||||
vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
|
|
||||||
unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
|
unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
|
||||||
elif [ "${RACADMONLINE}" == "false" ]; then
|
|
||||||
SENSORS_CHECK=''
|
|
||||||
else
|
else
|
||||||
SENSORS_CHECK=(${SENSORa})
|
SENSORS_CHECK=(${SENSORa})
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user