Update power.inc.sh
This commit is contained in:
@@ -593,20 +593,25 @@ CHECKPOWER(){
|
|||||||
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from Kyle's Equipment ... "
|
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from Kyle's Equipment ... "
|
||||||
|
|
||||||
KYLE_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-Power']}:8888/status/${PW_SENSOR_DEVICEID['KP-Power']} | jq '.dps')
|
KYLE_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-Power']}:8888/status/${PW_SENSOR_DEVICEID['KP-Power']} | jq '.dps')
|
||||||
|
KYLE_SASINFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['KP-SAS']}:8888/status/${PW_SENSOR_DEVICEID['KP-SAS']} | jq '.dps')
|
||||||
if [ "${KYLE_INFO}" != "" ]; then
|
if [ "${KYLE_INFO}" != "" ]; then
|
||||||
KYLE_AMP=$(echo "${KYLE_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
|
KYLE_SASAMP=$(echo "${KYLE_SASINFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||||
KYLE_AMP=$(ROUND_NUMBER $(echo "scale=3; ${KYLE_AMP}/1000" | tr -d $'\r' | bc -l) 2)
|
KYLE_SASAMP=$(ROUND_NUMBER $(echo "scale=3; ${KYLE_SASAMP}/1000" | tr -d $'\r' | bc -l) 2)
|
||||||
KYLE_WATT=$(echo "${KYLE_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
|
KYLE_SASWATT=$(echo "${KYLE_SASINFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||||
KYLE_WATT=$(echo "scale=1; ${KYLE_WATT}/10" | tr -d $'\r' | bc -l)
|
KYLE_SASWATT=$(echo "scale=1; ${KYLE_SASWATT}/10" | tr -d $'\r' | bc -l)
|
||||||
else
|
else
|
||||||
KYLE_AMP=0
|
KYLE_SASAMP=0
|
||||||
KYLE_WATT=0
|
KYLE_SASWATT=0
|
||||||
fi
|
fi
|
||||||
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
||||||
|
|
||||||
AD=$(IDS_NUMBER_FORMAT ${KYLE_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
AD=$(IDS_NUMBER_FORMAT ${KYLE_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
||||||
MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_WATT} 1 yes`'W ${idsCL[Default]}"
|
MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_WATT} 1 yes`'W ${idsCL[Default]}"
|
||||||
echo -en "${MSG}"
|
echo -en "${MSG}"
|
||||||
|
AD=$(IDS_NUMBER_FORMAT ${KYLE_SASAMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
|
||||||
|
MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_SASWATT} 1 yes`'W ${idsCL[Default]}"
|
||||||
|
echo -en "${MSG}"
|
||||||
|
|
||||||
if [ "${avgdays}" != "" ]; then
|
if [ "${avgdays}" != "" ]; then
|
||||||
echo -en "${idsCL[Yellow]} Calculating Kyle's Total Power Averages ... "
|
echo -en "${idsCL[Yellow]} Calculating Kyle's Total Power Averages ... "
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user