diff --git a/defaults.inc b/defaults.inc index f5c81f55..d67738eb 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.138-01132024' +VERS='2.5.139-01132024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 6535d9ef..5e98aba9 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -24,7 +24,7 @@ AVERAGEPOWER(){ while IFS=$'\t' read date ${ptype} ;do total=$(bc <<< "scale=2; ${total}+${!ptype}") ((logsfound++)) - done < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") + done < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() AND ${ptype} IS NOT NULL ORDER BY id DESC;") [ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0 echo ${average} fi