From ff27ca0e78defeb707aa306280cb448c42cf2128 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 14 Jun 2025 11:18:05 -0500 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/dsmon.sh b/dsmon.sh index c198c30..4a89826 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -111,17 +111,32 @@ CHECK(){ c=0; cw=${C_CW}; spc=''; spc1=$(expr ${cw} - ${#MSG}); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[LightCyan]}${MSG}${spc}: " fi - while read hostid hostname hostip hostlimits; do - if [ "$hostid" != "id" ]; then - hostip=$(echo $hostip | cut -d ";" -f1) - # echo "$hostid - $hostip - $hostname - $hostlimits" - host_ip[${hostid}]=$hostip - host_name[${hostid}]=$hostname - host_limits[${hostid}]=$hostlimits - host_ids[$hostname]=$hostid - hostnames_sort+=("$hostname") - fi - done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0") + if [ -n "$NTS" ] && [ "${1}" != "report" ]; then + while read hostid hostname hostip hostlimits; do + if [ "$hostid" != "id" ]; then + hostip=$(echo $hostip | cut -d ";" -f1) + # echo "$hostid - $hostip - $hostname - $hostlimits" + host_ip[${hostid}]=$hostip + host_name[${hostid}]=$hostname + host_limits[${hostid}]=$hostlimits + host_ids[$hostname]=$hostid + hostnames_sort+=("$hostname") + fi + done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND (host LIKE '%${1}' OR ip LIKE '%${1}')") + else + while read hostid hostname hostip hostlimits; do + if [ "$hostid" != "id" ]; then + hostip=$(echo $hostip | cut -d ";" -f1) + # echo "$hostid - $hostip - $hostname - $hostlimits" + host_ip[${hostid}]=$hostip + host_name[${hostid}]=$hostname + host_limits[${hostid}]=$hostlimits + host_ids[$hostname]=$hostid + hostnames_sort+=("$hostname") + fi + done <<< $(MYSQL_PWD="sysmoninsert" ${mysqlcmd} ${mysql_conn} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0") + fi + IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS [ "${1}" != "report" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"