From fd91437d9b90f061fbd5713280d7d1c077ecc65d Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Nov 2024 21:22:45 -0600
Subject: [PATCH] Update dsmon.sh

---
 dsmon.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dsmon.sh b/dsmon.sh
index 6934374..2e6fbfd 100755
--- a/dsmon.sh
+++ b/dsmon.sh
@@ -50,7 +50,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 3307 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "${QRY}"
 		
 		elif [ "${1}" = "sysXXX" ]; then
 		
@@ -58,7 +58,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 3307 -u sysmoninsert -e "${QRY}"
+			MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "${QRY}"
 		fi
 	
 		SERVERHOSTNAME=(`hostname`)
@@ -80,7 +80,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 3307 -u sysmoninsert -e "${QRY}"
+		MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "${QRY}"
 	
 
 	fi
@@ -120,8 +120,8 @@ CHECK(){
 			host_ids[$hostname]=$hostid
 			hostnames_sort+=("$hostname")
 		fi
-		done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
-	# done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND host LIKE '%WAN%'")	
+		done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	# done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 AND host LIKE '%WAN%'")	
 	IFS=$'\n' hostnames_sort=($(sort <<<"${hostnames_sort[*]}")); unset IFS
 	[ "${1}" != "report" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
 	
@@ -313,7 +313,7 @@ SETUPSSH(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0")
+	done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -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]})
@@ -341,7 +341,7 @@ RUNCMD(){
 	# 	if [ "${hostname}" != "host" ]; then
 	# 		ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${hostip} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22}
 	# 	fi
-	# done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	# done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 	
 	
 	while read hostid hostname hostip hostlimits; do
@@ -349,7 +349,7 @@ RUNCMD(){
 			RUNCMD_SUB $(echo ${hostip} | cut -d ";" -f1) ${hostname} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} &
 			((ncount++))
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 
 	nc_count=0; lcount=0; completed=false
 	until [ "${completed}" == "true" ]; do
@@ -412,7 +412,7 @@ UPDATENODES(){
 			ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@$(echo $hostip | cut -d ";" -f1) "dsmon update"
 			echo
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 	
 	echo
 	end=`date +%s`
@@ -452,7 +452,7 @@ GETCRONTABS(){
 			host_ip[${hostid}]=$(echo $hostip | cut -d ";" -f1)
 			host_name[${hostid}]=$hostname
 		fi
-	done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
+	done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT id,host,ip,limits FROM servermonitor.hosts WHERE disabled=0 ORDER BY host ASC")
 	
 	if [ "${rtpsswd}" == "" ]; then
 		read -p "Enter the password for the 'nm_crontab_user' account on MySQL-Manager: " rtpsswd
@@ -488,7 +488,7 @@ GETCRONTAB(){
 					# echo -e "${SERVERMON_ID}) ${host} : ${hostname}\nmysqlip=${mysqlip}\n"
 					crontab -l | sshpass -p${1} ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 -o 'StrictHostKeyChecking no' nm_crontab_user@${nmip} "cat > ${DS_CRONTAB_FOLDER}/${host}.crontab"
 				fi
-			done <<< $(MYSQL_PWD="sysmoninsert" mysql -h ${mysqlip} -P 3307 -u sysmoninsert -e "SELECT host,hostname FROM servermonitor.hosts WHERE id=${SERVERMON_ID}")
+			done <<< $(MYSQL_PWD="sysmoninsert" mariadb --skip-ssl -h ${mysqlip}  -P 3307 -u sysmoninsert -e "SELECT host,hostname FROM servermonitor.hosts WHERE id=${SERVERMON_ID}")
 		fi
 	
 		# [ "${nmip}" != "" ] && crontab -l | sshpass -p${1} ssh -o 'StrictHostKeyChecking no' nm_crontab_user@${nmip} "cat > ${DS_CRONTAB_FOLDER}/${hostname}.crontab"