diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 3ab1486f..bdeb4605 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -7,7 +7,7 @@ AVERAGEPOWER(){ watttotal=$(bc <<< "scale=2; ${watttotal}+${watt}") ((logsfound++)) done < <(${mysql_conn} -se "USE servermonitor; SELECT date,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") - [ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${watttotal}/${logsfound}") || average=0 + [ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${watttotal}/${logsfound}/1") || average=0 # echo "$watttotal-$logsfound=${average}" # echo "${average}-(${logsfound})" echo ${average} @@ -317,7 +317,7 @@ CHECKPOWER(){ fi if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average} 2`'watts" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average}" | bc`