From 297f65efcf65ac38381c4bd18bd5eb3224ff5340 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 2 May 2024 22:01:24 -0500 Subject: [PATCH] update --- inc/power.inc.bak.sh | 4 ++-- inc/power.inc.sh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/power.inc.bak.sh b/inc/power.inc.bak.sh index 68ea9f8c..0fc3d45e 100644 --- a/inc/power.inc.bak.sh +++ b/inc/power.inc.bak.sh @@ -167,7 +167,7 @@ CHECKPOWER(){ SVRRM_AMP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //') SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc` - AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSOR['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') + AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2) AIRCON_WATT=$(echo "${AIRCON_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') @@ -835,7 +835,7 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSOR['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') + AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') if [ "${AIRCON_INFO}" != "" ]; then AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 5bead873..01ee519e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -139,7 +139,7 @@ CHECKPOWER(){ SVRRM_AMP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //') SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc` - AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSOR['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') + AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') if [ "${AIRCON_INFO}" != "" ]; then AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2) @@ -323,10 +323,10 @@ CHECKPOWER(){ OFFSITE_BATT_VOLT=$(echo "${upsinfo}" | grep 'battery.voltage:' | sed 's/.*: //') OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //') - # declare -A OFFSITE_MISC - # for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do - # OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR}) - # done + declare -A OFFSITE_MISC + for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do + OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR}) + done fi @@ -950,7 +950,7 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSOR['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') + AIRCON_INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS['ServerRoom-AC']}:8888/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps') if [ "${AIRCON_INFO}" != "" ]; then AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') AIRCON_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AIRCON_AMP}/1000" | bc -l) 2) @@ -1214,9 +1214,9 @@ OFFSITE_SENDPOWER(){ } GET_TUYA_POWER(){ - INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSOR[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]} | jq '.dps') + INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]} | jq '.dps') echo - echo "HERE: ${1} 'http://${PW_REMOTE_SENSOR[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]}' = ${INFO}" + echo "HERE: ${1} 'http://${PW_REMOTE_SENSORS[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]}' = ${INFO}" if [ "${INFO}" != "" ]; then WATT=-1 if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then