Skip to content

Enforce socket protocol in mk_mysql #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enforce socket protocol in mk_mysql #821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions agents/plugins/mk_mysql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ do_query() {
# Check if mysqld is running and root password setup
echo "<<<mysql_ping>>>"
echo "$INSTANCE_HEADER"
$MYSQLADMIN --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} ping 2>&1 || return
$MYSQLADMIN --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} ping 2>&1 || return

echo "<<<mysql>>>"
echo "$INSTANCE_HEADER"
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -sN \
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} -sN \
-e "show global status ; show global variables ;"

echo "<<<mysql_capacity>>>"
echo "$INSTANCE_HEADER"
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -sN \
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} -sN \
-e "SELECT table_schema, sum(data_length + index_length), sum(data_free)
FROM information_schema.TABLES GROUP BY table_schema"

MYSQL_VERSION=$($MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -s -e "SELECT VERSION();" | grep -o '^[0-9]\+')
MYSQL_FULL_VERSION=$($MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -s -e "SELECT VERSION();")
MYSQL_VERSION=$($MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} -s -e "SELECT VERSION();" | grep -o '^[0-9]\+')
MYSQL_FULL_VERSION=$($MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} -s -e "SELECT VERSION();")

echo "<<<mysql_replica_slave>>>"
echo "$INSTANCE_HEADER"
Expand All @@ -49,7 +49,7 @@ do_query() {
else
STATUS_COMMAND="SHOW SLAVE STATUS\G"
fi
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -s \
$MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--protocol=socket --socket="$1"} -s \
-e "$STATUS_COMMAND"

}
Expand Down