From 3758aaacf3d6c3e8d3c1a47417348643fe88f9d7 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 1 Jun 2024 13:36:10 -0500 Subject: [PATCH] update --- inc/temp.inc.sh | 13 ++++++++++++- powerwall.sh | 14 ++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 9646a61f..e6d3c843 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -374,7 +374,13 @@ CHECKTEMP(){ echo -en "${idsCL[LightCyan]} Getting FanSpeed..." fi [ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done - RPM=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) + # RPM=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) + RPMs=($(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1 -O vq)) + RPM_tot=0 + for RPMn in "${RPMs[@]}"; do + RPM_tot=$(expr ${RPM_tot} + ${RPMn}) + done + RPM=$(ROUND_NUMBER $(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}")) [ "${avgdays}" != "noavg" ] && fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1") echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" [ "${SENSOR}" == "iDS-vMS-Host6" ] && cSENSOR="iDS-vMS-Host7" || cSENSOR=${SENSOR} @@ -1333,6 +1339,11 @@ Previous Temp: ${last_temp}${GAUGESH}" fi done + + if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then + + fi + fi else diff --git a/powerwall.sh b/powerwall.sh index b6a9336c..2bbed52f 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -909,17 +909,11 @@ fi #SENDTEMP ${2} # OFFSITE_SENDPOWER "OFFSITE POWER Service Startup TEST" #AVERAGETEMP "ServerRoomTH" ${2} - RPMs=($(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1 -O vq)) - RPM_tot=0 - for RPMn in "${RPMs[@]}"; do - echo "${RPMn}" - RPM_tot=$(expr ${RPM_tot} + ${RPMn}) + vHOST_FANS=$(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.8.1 -O vq | sed -e 's/"//g') + IFS=$'\n'; read -rd '' -a vHOST_FANS <<<"${vHOST_FANS}"; unset IFS + for vHOST_FAN in "${vHOST_FANS[@]}"; do + echo $vHOST_FAN done - echo "TOTs: ${RPM_tot} / ${#RPMs[@]}" - RPM=$(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}") - echo "AVG1: ${RPM}" - RPM=$(ROUND_NUMBER $(bc <<< "scale=0; ${RPM_tot}/${#RPMs[@]}")) - echo "AVG2: ${RPM}" ;;