From 547d1b6b400fd080d25bd7f985d028e294dd64ff Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 8 Jan 2024 22:58:56 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/defaults.inc b/defaults.inc index 886782c1..e68beca0 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.109-01072024' +VERS='2.5.110-01082024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index fb5aa526..bbcabd46 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -311,25 +311,25 @@ CHECKPOWER(){ MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -en "${MSG}" - - if [ "${HOST_WATT_SENSORS}" != "" ]; then - if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then + if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then + 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" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" - elif [ ${HOST_WATTS} -gt 0 ]; then - echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" - 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=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0) - echo -en "${idsCL[LightCyan]} Getting FanSpeed..." - until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; done - echo -en "\r\033[K${MSG}${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]" - rm -f ${PW_TMPFOLDER}/.fanspeed + else + if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ]; 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=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0) + echo -en "${idsCL[LightCyan]} Getting FanSpeed..." + until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; done + echo -en "\r\033[K${MSG}${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]" + rm -f ${PW_TMPFOLDER}/.fanspeed + + else + echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" + fi fi fi - echo -e "${idsCL[Default]}" fi fi