voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2024-01-31 08:50:31 -06:00
parent 07c6e44c3b
commit 5fbc07347a
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
inc/power.inc.sh
View File

@@ -65,9 +65,9 @@ CHECKPOWER(){
if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "esxi" ]; then
[ ${REPORT} -eq 0 ] && echo
[ ${REPORT} -eq 0 ] && DIVIDER . yellow 75
[ ${REPORT} -eq 0 ] && DIVIDER . yellow ${PRI_WIDTH}
echo -e "${idsCL[Yellow]}Mainsite Power Information ${idsCL[LightYellow]}${avgdayshdr}"
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... "
@@ -128,7 +128,7 @@ CHECKPOWER(){
echo -e "${idsCL[White]}Battery Amps Chg/DChg ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
# echo
DIVIDER . lightCyan 75
DIVIDER . lightCyan ${PRI_WIDTH}
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... "
@@ -173,7 +173,7 @@ CHECKPOWER(){
echo -en "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}~ est"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
DIVIDER . lightCyan 75
DIVIDER . lightCyan ${PRI_WIDTH}
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages ... "
NETRK_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
@@ -186,7 +186,7 @@ CHECKPOWER(){
echo -en "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}~ est"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e " ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
DIVIDER . lightCyan 75
DIVIDER . lightCyan ${PRI_WIDTH}
fi
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages ... "
@@ -208,9 +208,9 @@ CHECKPOWER(){
if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]) && [ "${PTYPE}" != "esxi" ]; then
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
echo -e "${idsCL[Yellow]}Offsite Power Information ${idsCL[LightYellow]}${avgdayshdr}"
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... "
@@ -254,9 +254,9 @@ CHECKPOWER(){
fi
if [ "${PTYPE}" != "power" ]; then
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
echo -e "${idsCL[Yellow]}ESXi Host Power Information ${avgdayshdr}"
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
SENSOR_TOTAL_WATTS_MAINSITE=0
SENSOR_TOTAL_AMPS_MAINSITE=0
SENSOR_TOTAL_WATTS_OFFSITE=0
@@ -353,7 +353,7 @@ CHECKPOWER(){
fi
fi
done
DIVIDER . lightCyan 75
DIVIDER . lightCyan ${PRI_WIDTH}
if [ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]; then
echo -en "${idsCL[LightCyan]}Mainsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE} 0`'watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AVERAGE_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'watts" || echo
@@ -691,7 +691,7 @@ HOSTPOWER(){
echo -e "\n${idsCL[Yellow]}POWERING ${2^^} '${PW_iDRACHOST_SHORTNAMES[${idracip}]}'"
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
if [ "${idracip}" != "" ]; then
@@ -767,9 +767,9 @@ PDUCONTROL(){
shift 1
done
echo
DIVIDER . yellow 75
DIVIDER . yellow ${PRI_WIDTH}
echo -e "${idsCL[Yellow]}APC-PDU Power Control"
DIVIDER true yellow 75
DIVIDER true yellow ${PRI_WIDTH}
until [ "${PORTSEL^^}" == "E" ]; do
[ "${PORT_SEL}" != "" ] && PORTSEL=${PORT_SEL}
if [ "${PORTSEL}" == "" ]; then

16
inc/temp.inc.sh
View File

@@ -68,13 +68,13 @@ CHECKTEMP(){
fi
if [ "${temptype}" != "esxi" ]; then
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
if [ "${avgdays}" != "noavg" ]; then
echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
else
echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S) Current ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
fi
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]]) && [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${temptype}" != "fans" ] || ([ "${temptype}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then
[ "${last_sensor}" == "${SENSOR%%-*}" ] && echo -en "\033[1A"
@@ -104,17 +104,17 @@ CHECKTEMP(){
last_sensor=${SENSOR%%-*}
fi
done
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
fi
if [ "${temptype}" != "sensors" ]; then
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
if [ "${avgdays}" != "noavg" ]; then
echo -e "${idsCL[LightYellow]}ESXI HOST TEMPERATURE(S) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
else
echo -e "${idsCL[LightYellow]}ESXI HOST TEMPERATURE(S) Current ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
fi
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]]) && [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then
vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
@@ -151,7 +151,7 @@ CHECKTEMP(){
echo -e "${idsCL[Default]}"
fi
# if [ "${temptype}" != "fans" ]; then
DIVIDER . lightCyan 70
DIVIDER . lightCyan ${PRI_WIDTH}
echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
# if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "$(CHECK_HOST ${vHOSTIP})" != "false" ]; then
@@ -910,7 +910,7 @@ ESXI_FANSPEED_MGMT(){
fi
echo -e "${idsCL[Yellow]}Setting new FanSpeeds for the following ESXi Hosts:"
DIVIDER . yellow
DIVIDER . yellow ${PRI_WIDTH}
if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
@@ -951,7 +951,7 @@ ESXI_FANSPEED_MGMT(){
[ -f ${PW_TMPFOLDER}/${PW_iDRACHOST_SHORTNAMES[${host}]}.down ] && echo " - Offline, skipping" || echo
fi
done
DIVIDER true yellow
DIVIDER true yellow ${PRI_WIDTH}
for host in ${PW_ESXI_FANSPEEDCONTROLHOSTS[@]}; do
tmp=temp