From fdec661b6a9005e4d5c338da921023ce7c41c2df Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 28 Jan 2024 18:26:52 -0600 Subject: [PATCH] update --- defaults.inc | 3 ++- inc/temp.inc.sh | 41 +++++++++++++++++++++++++++++++++++++++++ powerwall.sh | 1 + 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index 1a7af117..88293971 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.189-01282024' +VERS='2.5.190-01282024' noheader=' update service dailytemp confsync -r -report ' @@ -42,6 +42,7 @@ PW_SYSHOSTS=(${PW_SYS_HOSTS}) PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS}) PW_ALLHOSTS=(${PW_ALL_HOSTS}) PW_CONSERVEHOSTS=(${PW_CONSERVE_HOSTS}) +PW_ESXI_FANSPEEDCONTROLHOSTS=(${PW_ESXI_FANSPEEDCONTROL_HOSTS}) unset IFS if [ -f ${PW_FOLDER}/settings.local.conf ]; then diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 6ed1376f..3c2eed1b 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -837,6 +837,47 @@ SET_ESXI_FANSPEED(){ echo "${SET_FanSpeed}" >| ${PW_TMPFOLDER}/.lastfancheck/${SET_HOST}.set [ "${SET_HOST}" == "iDS-vMS-Host7" ] && SET_ESXI_FANSPEED ${SET_FanSpeed} iDS-vMS-Host6 >/dev/null 2>&1 & } +ESXI_FANSPEED_MGMT(){ + HOST=${1} + MN=0 + if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then + tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]} + ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]} + elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then + ESXI_HOST=${HOST} + elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}" != "" ]; then + ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]} + elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}" != "" ]; then + ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]} + elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then + ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]} + elif [ "${HOST^^}" == "ALL" ] || [ "${HOST^^}" == "MAINSITE" ] || [ "${HOST^^}" == "OFFSITE" ] || [ "${HOST^^}" == "MAIN" ] || [ "${HOST^^}" == "SYS" ] || [ "${HOST^^}" == "CONSERVE" ]; then + ESXI_HOST=${HOST^^} + MN=1 + else + ESXI_HOST='' + fi + if [ "${ESXI_HOST}" == "" ]; then + echo -e "Invalid host\n" + exit 1 + fi + + if [ ${MN} -eq 1 ]; then + [ "${ESXI_HOST}" == "ALL" ] && hostname="All Host Servers" || hostname="All ${ESXI_HOST} Host Servers" + # + # elif [ "${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}" != "" ]; then + # tmp=${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + # idracip=${PW_HOST_IDRACS[${tmp}]} + # hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]} + else + tmp=${PW_ESXI_HOST_NAMES[${ESXI_HOST}]} + idracip=${PW_HOST_IDRACS[${tmp}]} + hostname=${PW_iDRACHOST_SHORTNAMES[${idracip}]} + fi + + echo -e "HERE: ${ESXI_HOST} - $hostname - $idracip" + +} SENDTEMPS(){ st_temps=$(SENDTEMP ${2}) diff --git a/powerwall.sh b/powerwall.sh index 136b96bd..bd437abb 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -838,6 +838,7 @@ fi hostpower) HOSTPOWER ${2} ${3};; host) HOSTMGMT ${2} ${3} ${4} ${5} ${6} ${7};; set-drs) ${PW_FOLDER}/esxi-scripts/set-drs.ps1 ${2};; + set-fanspeed) ESXI_FANSPEED_MGMT ${2} ${3} ${4} ${5};; pdu) PDUCONTROL ${2} ${3};;