update
This commit is contained in:
@@ -1029,14 +1029,14 @@ POWERLOGGER_SERVICE(){
|
||||
BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
|
||||
BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('${PW_POWERSENSOR_ID['inv-in']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${INPUTV}','${INPUTA}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp) VALUES ('${PW_POWERSENSOR_ID['inv-in']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${INPUTV}','${INPUTA}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['inv-out']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${OUTPUTV}','${OUTPUTA}','${OUTPUTW}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['inv-out']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${OUTPUTV}','${OUTPUTA}','${OUTPUTW}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('${PW_POWERSENSOR_ID['battery']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${BATTV}','${BATTA}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp) VALUES ('${PW_POWERSENSOR_ID['battery']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${BATTV}','${BATTA}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
|
||||
QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES (CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${INVSTATSINFO}')"
|
||||
QRY="INSERT INTO inv_jsonstats (date, data) VALUES (CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${INVSTATSINFO}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
@@ -1046,7 +1046,7 @@ POWERLOGGER_SERVICE(){
|
||||
SVRRM_WATT=$(snmpwalk -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
|
||||
SVRRM_AMP=$(snmpwalk -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`
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['total']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
@@ -1055,9 +1055,9 @@ POWERLOGGER_SERVICE(){
|
||||
APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
|
||||
if [ "${SVRRM_VOLT}" != "" ]; then
|
||||
APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['server-rack']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['server-rack']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
|
||||
else
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`) VALUES ('12',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${APCPDU_AMP}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, amp) VALUES ('12',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${APCPDU_AMP}')"
|
||||
fi
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
@@ -1066,7 +1066,7 @@ POWERLOGGER_SERVICE(){
|
||||
NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
|
||||
NETRK_WATT=$(ROUND_NUMBER `echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` 0)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['network-rack']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['network-rack']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
@@ -1079,7 +1079,7 @@ POWERLOGGER_SERVICE(){
|
||||
AIRCON_VOLT=$(echo "${AIRCON_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
AIRCON_VOLT=$(echo "scale=3; ${AIRCON_VOLT}/10" | bc -l)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['ServerRoom-AC']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${AIRCON_VOLT}','${AIRCON_AMP}','${AIRCON_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['ServerRoom-AC']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${AIRCON_VOLT}','${AIRCON_AMP}','${AIRCON_WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
|
||||
else
|
||||
@@ -1090,7 +1090,7 @@ POWERLOGGER_SERVICE(){
|
||||
if [ "${SVRRM_WATT}" != "" ]; then
|
||||
SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
|
||||
SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total-wac']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, amp, watt) VALUES ('${PW_POWERSENSOR_ID['total-wac']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
@@ -1104,7 +1104,7 @@ POWERLOGGER_SERVICE(){
|
||||
KYLE_VOLT=$(echo "${KYLE_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
KYLE_VOLT=$(echo "scale=3; ${KYLE_VOLT}/10" | bc -l)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['KP-Power']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['KP-Power']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
|
||||
else
|
||||
@@ -1120,7 +1120,7 @@ POWERLOGGER_SERVICE(){
|
||||
KYLE_VOLT=$(echo "${KYLE_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
|
||||
KYLE_VOLT=$(echo "scale=3; ${KYLE_VOLT}/10" | bc -l)
|
||||
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['KP-SAS']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['KP-SAS']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${KYLE_VOLT}','${KYLE_AMP}','${KYLE_WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
|
||||
else
|
||||
@@ -1153,14 +1153,14 @@ POWERLOGGER_SERVICE(){
|
||||
OFFSITE_AMPS=${TOTAL_MISC_AMPS}
|
||||
fi
|
||||
fi
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-ups']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID['offsite-ups']}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
|
||||
IFS=: read -r AMP WATT VOLT <<< $(GET_TUYA_POWER ${mSENSOR}); unset IFS
|
||||
if [ "${VOLT}" != "" ] && [ "${PW_POWERSENSOR_ID[${mSENSOR}]}" != "" ]; then
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID[${mSENSOR}]}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${VOLT}','${AMP}','${WATT}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, volt, amp, watt) VALUES ('${PW_POWERSENSOR_ID[${mSENSOR}]}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${VOLT}','${AMP}','${WATT}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
done
|
||||
@@ -1201,7 +1201,7 @@ POWERLOGGER_SERVICE(){
|
||||
[ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}"
|
||||
[ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}"
|
||||
HOST_AMPS=`echo "scale=1; ${PS1}+${PS2}" | bc`
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID[${SENSOR}]}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${HOST_AMPS}','${HOST_WATTS}')"
|
||||
QRY="INSERT INTO power_data (sensorid, date, amp, watt) VALUES ('${PW_POWERSENSOR_ID[${SENSOR}]}',CONVERT_TZ('${LogDataTime}', 'America/Chicago', 'UTC'),'${HOST_AMPS}','${HOST_WATTS}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1276,31 +1276,31 @@ Previous Temp: ${last_temp}${GAUGESH}"
|
||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
if [ "${entityid[1]}" == "" ]; then
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')"
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (sensorid, name) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')"
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
fi
|
||||
entityid=${entityid[1]}
|
||||
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, entity, date, temp) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
|
||||
# if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]] && [ "${vSENSOR// /_}" == "System_Board_Inlet" ] && [ "${FanSpeed}" != "" ]; then
|
||||
if [ "${vSENSOR// /_}" == "System_Board_Inlet" ] && [ "${FanSpeed}" != "" ]; then
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='FanSpeed' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
if [ "${entityid[1]}" == "" ]; then
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','FanSpeed')"
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (sensorid, name) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','FanSpeed')"
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='FanSpeed' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
fi
|
||||
entityid=${entityid[1]}
|
||||
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${FanSpeed}')"
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (sensorid, entity, date, speed) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${FanSpeed}')"
|
||||
|
||||
fi
|
||||
|
||||
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSORa}" = *"FAN"* ]]; then
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_c}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, date, speed) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_c}')"
|
||||
|
||||
elif [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]; then
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}','${temp_h}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, date, temp, hum) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}','${temp_h}')"
|
||||
|
||||
elif [ "${SENSOR}" == "Powerwall-Switch" ]; then
|
||||
[ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && touch ${PW_TMPFOLDER}/${SENSOR}.down
|
||||
@@ -1317,11 +1317,11 @@ Previous Temp: ${last_temp}${GAUGESH}"
|
||||
|
||||
elif [ "${SENSOR}" == "AC" ]; then
|
||||
if [ "${target}" != "32" ] && [ "${target}" != "32.00" ]; then
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('38',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${target}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (sensorid, date, temp) VALUES ('38',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${target}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, date, temp) VALUES ('${PW_SENSOR_ID[${SENSOR}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
fi
|
||||
else
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, date, temp) VALUES ('${PW_SENSOR_ID[${SENSORa}]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_f}')"
|
||||
|
||||
fi
|
||||
if [ "${QRY}" != "" ]; then
|
||||
@@ -1330,7 +1330,7 @@ Previous Temp: ${last_temp}${GAUGESH}"
|
||||
|
||||
fi
|
||||
# if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then
|
||||
# ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_probe_f}')"
|
||||
# ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (sensorid, date, temp) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${temp_probe_f}')"
|
||||
# fi
|
||||
fi
|
||||
|
||||
@@ -1402,12 +1402,12 @@ Previous Temp: ${last_temp}${GAUGESH}"
|
||||
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vHOST_FAN// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
if [ "${entityid[1]}" == "" ]; then
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vHOST_FAN// /_}')"
|
||||
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (sensorid, name) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vHOST_FAN// /_}')"
|
||||
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vHOST_FAN// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
|
||||
fi
|
||||
entityid=${entityid[1]}
|
||||
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${fanrpm}')"
|
||||
QRY="USE servermonitor; INSERT INTO sensor_data (sensorid, entity, date, speed) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}',CONVERT_TZ('$(date +'%Y-%m-%d %H:%M:%S')', 'America/Chicago', 'UTC'),'${fanrpm}')"
|
||||
${mysql_conn} -e "${QRY}"
|
||||
echo "${fanrpm}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSORa}-${vHOST_FAN// /_}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user