diff --git a/defaults.inc b/defaults.inc index f04d366e..4afa1c51 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.75-12272023' +VERS='2.5.76-12272023' noheader=' update service dailytemp confsync ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 06d7cbd8..94aab780 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -299,7 +299,7 @@ CHECKPOWER(){ fi if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ] && [ ${HOST_WATTS} -ge 0 ]; then vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) - FanSpeed=$(ROUND_NUMBER `echo "scale=2; ${vHOSTFAN}/21200" | bc`); FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc` + FanSpeed=$(ROUND_NUMBER `echo "scale=2; ${vHOSTFAN}/21200" | bc` 0); FanSpeed=`echo "scale=0; ${FanSpeed}*100/1" | bc` # vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSOR}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1) # FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]" @@ -591,7 +591,7 @@ POWERLOGGER_SERVICE(){ if [ "${SVRRM_VOLT}" != "" ] && [ "${APCPDU_AMP}" != "" ]; then NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` - NETRK_WATT=$(ROUND_NUMBER `echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`) + NETRK_WATT=$(ROUND_NUMBER `echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` 0) QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['network-rack']}','${LogDataTime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 5cc9e3cd..8fed0def 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -13,7 +13,7 @@ CHECKTEMP(){ echo if [ "${avgdays}" != "" ]; then if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then - avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60"))Min" + avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0)Min" elif [ $(bc -l <<< "${avgdays} < 10") -eq 1 ]; then avgdays_disp=" ${avgdays}Day" else @@ -86,7 +86,7 @@ CHECKTEMP(){ echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}" if [ "${avgdays}" != "noavg" ]; then if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then - avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60")) Minute" + avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0) Minute" else avgdays_disp="${avgdays} Day" fi @@ -294,7 +294,7 @@ AVERAGETEMP(){ done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;") if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") - average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}")) + average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) else average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") fi @@ -474,7 +474,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) # vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1) if [ "${vHOSTFAN}" != "" ]; then - FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'`) + FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0) # FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') else FanSpeed=''