From 52d7dfef18d9ce1d4a2bfd4e5d240305cf12dea4 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 1 Jun 2024 13:44:29 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 3e71bde5..bc0c304c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.7.56-06012024' +VERS='2.7.57-06012024' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 8a000eff..ef6ec3b9 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -1343,9 +1343,19 @@ Previous Temp: ${last_temp}${GAUGESH}" if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then vHOST_FANS=$(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.8.1 -O vq | sed -e 's/"//g') IFS=$'\n'; read -rd '' -a vHOST_FANS <<<"${vHOST_FANS}"; unset IFS - # for vHOST_FAN in "${vHOST_FANS[@]}"; do - # echo $vHOST_FAN - # done + for vHOST_FAN in "${vHOST_FANS[@]}"; do + fanrpm=$(snmpwalk -v 1 -c public -t 2 10.10.2.27 .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.${vHOST_FAN: -1} -O vq | sed -e 's/"//g') + + 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// /_}')" + 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\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','$(date +'%Y-%m-%d %H:%M:%S')','${fanrpm}')" + + done fi fi