From 3ec9df08b72e26a34ba09ea1601fb5768af46965 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 6 Feb 2024 21:26:26 -0600 Subject: [PATCH] update --- inc/power.inc.sh | 12 ++++++------ inc/temp.inc.sh | 20 ++++++++++---------- powerwall.sh | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 9b0c0d01..912a4982 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -45,12 +45,12 @@ CHECKPOWER(){ REPORT=0 while [ $# -gt 0 ]; do case "$1" in - -a|-avg) avgdays=${2};; - -o|-offsite) STYPE=offsite;; - -m|-mainsite) STYPE=mainsite;; - -e|-esxi) PTYPE=esxi;; - -p|-power) PTYPE=power;; - -r|-report) + -a,-avg) avgdays=${2};; + -o,-offsite) STYPE=offsite;; + -m,-mainsite) STYPE=mainsite;; + -e,-esxi) PTYPE=esxi;; + -p,-power) PTYPE=power;; + -r,-report) REPORT=1 unset idsCL idsBG idsST idsCL=('') diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 4263c821..d8b86c6b 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -28,13 +28,13 @@ CHECKTEMP(){ cdt=$(date +%Y-%m-%d-%H-%M-%S) while [ $# -gt 0 ]; do case "$1" in - -a|-avg) avgdays=${2};; - -S|-sensors) TTYPE="sensors";; - -o|-offsite) STYPE=offsite;; - -m|-mainsite) STYPE=mainsite;; - -e|-esxi) TTYPE="esxi";; - -f|-fans) TTYPE="fans";; - -s|-search) search=${2};; + -a,-avg) avgdays=${2};; + -S,-sensors) TTYPE="sensors";; + -o,-offsite) STYPE=offsite;; + -m,-mainsite) STYPE=mainsite;; + -e,-esxi) TTYPE="esxi";; + -f,-fans) TTYPE="fans";; + -s,-search) search=${2};; esac shift 1 done @@ -1100,11 +1100,11 @@ SERVERROOM_TEMP_DIFFERENCE(){ scandefault=288 while [ $# -gt 0 ]; do case "${1}" in - -l|-last) LAST=${2};; - -h|-help|--help) + -l,-last) LAST=${2};; + -h,-help,--help) echo -e "Usage: ${idsCL[Yellow]}[powerwall or pw] tempdiff {opt}${idsCL[Default]} {" width=15 - printf "%-${width}s- %s\n" " -l|-last" "(number of last scan times to average from, defaults to ${scandefault})" + printf "%-${width}s- %s\n" " -l,-last" "(number of last scan times to average from, defaults to ${scandefault})" echo -e "}\n" exit 0;; esac diff --git a/powerwall.sh b/powerwall.sh index c5771838..f51c9902 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -203,14 +203,14 @@ SHUTDOWN_SERVER(){ fi while [ $# -gt 0 ]; do case "$1" in - -p|-power) POWER=${2}; MODE="power";; - -e|-esxi) ESXI=${2}; MODE="esxi";; + -p,-power) POWER=${2}; MODE="power";; + -e,-esxi) ESXI=${2}; MODE="esxi";; -h) echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {" width=35 printf "%-${width}s- %s\n" " {host}" "(*required, can either be esxiIP,idracIP or Host#)" - printf "%-${width}s- %s\n" " -p|-power {on / off}" "Controls Host Power" - printf "%-${width}s- %s\n" " -e|-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" + printf "%-${width}s- %s\n" " -p,-power {on / off}" "Controls Host Power" + printf "%-${width}s- %s\n" " -e,-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" echo -e "}\n" exit 0 ;; @@ -544,16 +544,16 @@ HOSTMGMT(){ echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {" width=35 printf "%-${width}s- %s\n" " {host}" "(*required if not uing -s, can either be esxiIP,idracIP or Host#)" - printf "%-${width}s- %s\n" " -p|-power {on / off}" "Controls Host Power" - printf "%-${width}s- %s\n" " -e|-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" - printf "%-${width}s- %s\n" " -s|-status" "List all Host's Status" + printf "%-${width}s- %s\n" " -p,-power {on / off}" "Controls Host Power" + printf "%-${width}s- %s\n" " -e,-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" + printf "%-${width}s- %s\n" " -s,-status" "List all Host's Status" echo -e "}\n" exit 0 fi while [ $# -gt 0 ]; do case "$1" in - -p|-power) POWER=${2}; MODE="power";; - -e|-esxi) ESXI=${2}; MODE="esxi";; + -p,-power) POWER=${2}; MODE="power";; + -e,-esxi) ESXI=${2}; MODE="esxi";; esac shift 1 done @@ -790,24 +790,24 @@ fi ${PW_SCRIPT} check temp ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${PW_SCRIPT} check power ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ;; - -h|-help) + -h,-help) echo -e "\nUsage: ${idsCL[Yellow]}[powerwall or pw] ${idsCL[LightYellow]}check ${idsCL[LightCyan]}{type} {flags} ${idsCL[Default]} {\n" width=35 printf "%-${width}s- %s\n" " {type}" "{power or temp} To check either power or temperatures" echo -e "\n ${idsCL[LightCyan]}power${idsCL[Default]} {flag} options" - printf "%-${width}s- %s\n" " -a|-avg {#days}" "Show average values for X number of days" - printf "%-${width}s- %s\n" " -e|-esxi" "Narrow to ESXi Hosts" - 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" " -a,-avg {#days}" "Show average values for X number of days" + printf "%-${width}s- %s\n" " -e,-esxi" "Narrow to ESXi Hosts" + 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" echo -e "\n ${idsCL[LightCyan]}temp${idsCL[Default]} {flag} options" - printf "%-${width}s- %s\n" " -a|-avg {#days}" "Show average values for X number of days" - printf "%-${width}s- %s\n" " -e|-esxi" "Narrow to ESXi Hosts Only" - printf "%-${width}s- %s\n" " -f|-fans" "Display ESXi Host Fanspeed Info" - 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" " -s|-search" "Narrow to search of sensor name" - printf "%-${width}s- %s\n" " -S|-sensors" "Narrow to Sensors Only" + printf "%-${width}s- %s\n" " -a,-avg {#days}" "Show average values for X number of days" + printf "%-${width}s- %s\n" " -e,-esxi" "Narrow to ESXi Hosts Only" + printf "%-${width}s- %s\n" " -f,-fans" "Display ESXi Host Fanspeed Info" + 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" " -s,-search" "Narrow to search of sensor name" + printf "%-${width}s- %s\n" " -S,-sensors" "Narrow to Sensors Only" echo -e "}\n" exit 0 ;; @@ -950,8 +950,8 @@ fi echo -e " ${idsCL[Yellow]} host = individual {esxi-ip}, {idrac-ip}, {hostname} or {host-number;0-9}" echo -e " ${idsCL[Yellow]} host = groups { all / mainsite / offsite / main / sys }" echo -e " ${idsCL[Yellow]} flags =" - echo -e " ${idsCL[Yellow]} -p|-power { on / off } ${idsCL[Default]}--> Controls Host Power" - echo -e " ${idsCL[Yellow]} -e|-esxi { off / mm } ${idsCL[Default]}--> Shuts down ESXi or puts into maintenance mode" + echo -e " ${idsCL[Yellow]} -p,-power { on / off } ${idsCL[Default]}--> Controls Host Power" + echo -e " ${idsCL[Yellow]} -e,-esxi { off / mm } ${idsCL[Default]}--> Shuts down ESXi or puts into maintenance mode" echo echo -e " ${idsCL[LightCyan]}iscsi-vm-shutdown${idsCL[Yellow]} {type} ${idsCL[Default]}--> Shutdown VM's running on iSCSI-(PRI or SYS) Datastore(s)" echo -e " ${idsCL[Yellow]} type = { sys / main }"