From 2d5943bf6a05f2616f08196aabeaf87ae540a31b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 6 Jul 2023 20:18:15 -0500
Subject: [PATCH] update

---
 defaults.inc |  2 +-
 dsmon.sh     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index d52571c..3941372 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS=2.2.16-07042023
+VERS=2.2.17-07042023
 
 DS_FOLDER=/opt/idssys/dsmon
 DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs
diff --git a/dsmon.sh b/dsmon.sh
index 51a0c65..58df75a 100755
--- a/dsmon.sh
+++ b/dsmon.sh
@@ -49,7 +49,7 @@ RUN(){
 			
 			QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');"
 			# echo $QRY
-			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
 		
 		elif [ "${1}" = "sys" ]; then
 		
@@ -57,7 +57,7 @@ RUN(){
 			CPU=$(top -bn1 | grep load | awk '{printf "%.2f\t\t\n", $(NF-2)}')
 			
 			QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','sys','${CPU//		/};${MEMORY}');"
-			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
 		fi
 	
 		SERVERHOSTNAME=(`hostname`)
@@ -79,7 +79,7 @@ RUN(){
 		done
 
 		QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';"
-		MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
+		MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "${QRY}"
 	
 
 	fi
@@ -104,7 +104,7 @@ CHECK(){
 			host_ids[$hostname]=$hostid
 			hostnames_sort+=("$hostname")
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
 	
 	IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS
 	
@@ -256,7 +256,7 @@ SETUPSSH(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
 	
 	for hostid in "${!host_ip[@]}"; do
 		checkhost=$(CHECK_HOST ${host_ip[$hostid]})
@@ -278,7 +278,7 @@ RUNCMD(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 
 	for hostid in "${!host_ip[@]}"; do
 		checkhost=$(CHECK_HOST ${host_ip[$hostid]})
@@ -310,7 +310,7 @@ GETCRONTABS(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 	
 	if [ "${1}" == "" ]; then
 		read -p "Enter the password for the 'nm_crontab_user' account on MySQL-Manager: " rtpsswd