From b9bbad8e7b0e02f98b6fcfb74c994b547a25ee4e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 4 Jul 2023 23:53:30 -0500
Subject: [PATCH] update

---
 defaults.inc |  9 +++++++++
 dsmon.sh     | 24 +++++++-----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index e46a51b..f3c47a1 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -5,6 +5,15 @@ VERS=2.2.15-07042023
 DS_FOLDER=/opt/idssys/dsmon
 DS_CRONTAB_FOLDER=/opt/idssys/nodemgmt/crontabs
 
+if [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then
+	nmip=10.10.10.50
+	mysqlip=10.10.1.50
+elif [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then
+	nmip=100.100.55.1
+	mysqlip=100.100.5.2
+else
+	nmip=
+fi
 
 SENDNOTICE(){
 	[ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2}
diff --git a/dsmon.sh b/dsmon.sh
index 5470d5c..f3aed1e 100755
--- a/dsmon.sh
+++ b/dsmon.sh
@@ -48,7 +48,7 @@ RUN(){
 			done
 		
 			QRY="USE servermonitor; INSERT INTO sysinfo (\`host\`, \`entry\`, \`value\`) VALUES ('${SERVERMON_ID}','hdd','${DRIVE_INFO[@]}');"
-			MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 6033 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 6033 -u sysmoninsert -e "${QRY}"
 		
 		elif [ "${1}" = "sys" ]; then
 		
@@ -56,7 +56,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 mysqldb.scity.us -P 3306 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
 		fi
 	
 		SERVERHOSTNAME=(`hostname`)
@@ -78,7 +78,7 @@ RUN(){
 		done
 
 		QRY="USE servermonitor; UPDATE hosts SET ip='${SERVERIPS// /}',hostname='${SERVERHOSTNAME}',limits='${thresholdlog[@]}' WHERE id='${SERVERMON_ID}';"
-		MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "${QRY}"
+		MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "${QRY}"
 	
 
 	fi
@@ -103,7 +103,7 @@ CHECK(){
 			host_ids[$hostname]=$hostid
 			hostnames_sort+=("$hostname")
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
 	
 	IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS
 	
@@ -255,7 +255,7 @@ SETUPSSH(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -P 3306 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3306 -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]})
@@ -277,7 +277,7 @@ RUNCMD(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -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} -P 3306 -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]})
@@ -309,7 +309,7 @@ GETCRONTABS(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h mysqldb.scity.us -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} -P 3306 -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
@@ -340,16 +340,6 @@ GETCRONTAB(){
 		if ! command -v sshpass > /dev/null; then
 			apt install -y sshpass > /dev/null 2>&1
 		fi
-	
-		if [ "$(CHECK_HOST 10.10.10.50)" != "false" ]; then
-			nmip=10.10.10.50
-			mysqlip=10.10.1.50
-		elif [ "$(CHECK_HOST 100.100.55.1)" != "false" ]; then
-			nmip=100.100.55.1
-			mysqlip=100.100.5.2
-		else
-			nmip=
-		fi
 		
 		if [ "${nmip}" != "" ]; then
 			while read host hostname; do