diff --git a/defaults.inc b/defaults.inc index 5142f23a..055cb24b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.3.30-10302023' +VERS='2.3.60-10302023' noheader=' update service dailytemp ' @@ -99,6 +99,14 @@ PW_ESXI_HOST_NAMES['10.10.2.17']='iDS-vMS7.scity.us' PW_ESXI_HOST_NAMES['10.2.1.18']='iDS-vMS2-Offsite.scity.us' PW_ESXI_HOST_NAMES['10.2.1.11']='iDS-vMS1.Offsite.scity.us' +declare -A PW_ESXI_HOST_SHORTNAMES +PW_ESXI_HOST_SHORTNAMES['10.10.2.10']='iDS-vMS-Host0' +PW_ESXI_HOST_SHORTNAMES['10.10.2.11']='iDS-vMS-Host1' +PW_ESXI_HOST_SHORTNAMES['10.10.2.12']='iDS-vMS-Host2' +PW_ESXI_HOST_SHORTNAMES['10.10.2.16']='iDS-vMS-Host6' +PW_ESXI_HOST_SHORTNAMES['10.10.2.17']='iDS-vMS-Host7' +PW_ESXI_HOST_SHORTNAMES['10.2.1.11']='OFF-vMS-Host1' + PW_VCENTERHOST=10.10.1.30 PW_MAINHOSTS=10.10.2.10,10.10.2.11 PW_SYSHOSTS=10.10.2.16,10.10.2.17 @@ -112,6 +120,7 @@ IFS=, PW_MAINSITE_HOSTS=(${PW_MAINSITE_HOSTS}) PW_MAINHOSTS=(${PW_MAINHOSTS}) PW_SYSHOSTS=(${PW_SYSHOSTS}) +PW_ALLHOSTS=(${PW_ALL_HOSTS}) unset IFS SENDNOTICE(){ diff --git a/powerwall.sh b/powerwall.sh index 7ba43668..5643a0fd 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -549,6 +549,14 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP}V${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}" + + echo + for ESXIHOST in "${PW_ALLHOSTS[@]}"; do + vHOSTPOWER=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${ESXIHOST} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Pwr" 2>&1) + watts=$(echo ${vHOSTPOWER} | awk '/ / {print $6}' | sed -e 's/Watts//g') + echo -e "${idsCL[LightCyan]}vMS-Host ${PW_ESXI_HOST_SHORTNAMES[${ESXIHOST}]} ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" + fi + [ "${action}" != "" ] && echo }