From 316ae76a517999bf31946659173ea3f0392ae55d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 9 Jan 2024 10:15:42 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 713fe861..b03c0d9e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.113-01092024' +VERS='2.5.114-01092024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 7f9f08b1..9ad72761 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -21,7 +21,11 @@ GET_OFFSITEHOST_FANSPEED(){ GET_HOST_FANSPEED(){ for ESXIHOST in "${PW_ALLHOSTS[@]}"; do vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -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') + if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then + FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g') + else + FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') + fi echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${ESXIHOST}]} done }