From a13e437c90af77a311ea701ad25e8a5c0d64978c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Dec 2023 21:56:25 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index cda707f0..1708469e 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -547,18 +547,18 @@ CHECKPOWER(){ rm -f ${PW_TMPFOLDER}/*.hostpower* while [ $# -gt 0 ]; do case "$1" in - -avg) avgdays=${2};; - -offsite) STYPE=offsite;; - -mainsite) STYPE=mainsite;; - -hosts) PTYPE=hosts;; - -power) PTYPE=power;; + -a|-avg) avgdays=${2};; + -o|-offsite) STYPE=offsite;; + -m|-mainsite) STYPE=mainsite;; + -e|-esxi) PTYPE=esxi;; + -p|-power) PTYPE=power;; esac shift 1 done [ "${avgdays}" = "0" ] && unset avgdays [ "${avgdays}" != "" ] && avgdayshdr="${avgdays}-Day-Avg" || avgdayshdr="" - if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "hosts" ]; then + if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]) && [ "${PTYPE}" != "esxi" ]; then echo DIVIDER . yellow 75 echo -e "${idsCL[Yellow]}Mainsite Power Information ${avgdayshdr}" @@ -696,7 +696,7 @@ CHECKPOWER(){ fi - if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]) && [ "${PTYPE}" != "hosts" ]; then + if ([ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]) && [ "${PTYPE}" != "esxi" ]; then DIVIDER . yellow 75 echo -e "${idsCL[Yellow]}Offsite Power Information ${avgdayshdr}" @@ -2311,11 +2311,22 @@ fi checktemp) CHECKTEMP ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; checkpower) CHECKPOWER ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; check) - if [ "${2}" = "power" ]; then - CHECKPOWER ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} - elif [ "${2}" = "temp" ]; then - CHECKTEMP ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} - fi + case ${2} in + power) CHECKPOWER ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; + temp) CHECKTEMP ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10};; + -h|-help) + echo -e "Usage: ${idsCL[Yellow]}[powerwall or pw] check {type} {flags} ${idsCL[Default]} {" + width=35 + printf "%-${width}s- %s\n" " {type}" "{power / temp} To check either power or temperatures" + printf "%-${width}s- %s\n" " -a|-avg {#days}" "Show average values for X number of days" + printf "%-${width}s- %s\n" " -m|-mainsite" "Narrow to Mainsite Equipment" + printf "%-${width}s- %s\n" " -o|-offsite" "Narrow to Offsite Equipment" + printf "%-${width}s- %s\n" " -p|-power" "Narrow to Power Equipment" + printf "%-${width}s- %s\n" " -e|-esxi" "Narrow to ESXi Hosts" + echo -e "}\n" + exit 0 + ;; + esac ;; test) CHECKTEMP ${2} ${3};; iscsi-vm-shutdown)