15336 FIX Add support for MariaDB 11

SUP-18615

Change-Id: I2dfe0a57fd5a0a148bb48d9f31b26a7e3c3ad8c5

Author: BenediktSeidl

.werks/15336.md

@@ -0,0 +1,21 @@
+[//]: # (werk v2)
+# Add support for MariaDB 11
+
+key        | value
+---------- | ---
+compatible | yes
+version    | 2.4.0b1
+date       | 2024-06-10T07:54:55+00:00
+level      | 1
+class      | fix
+component  | checks
+edition    | cre
+
+
+MariaDB 11 deprecated mysql* binaries and shows an error message like:
+
+```
+mysqladmin: Deprecated program name. It will be removed in a future release, use ‘/usr/bin/mariadb-admin’ instead
+```
+
+The agent plugin now checks if the MariaDB binaries are available and prefers them over the mySQL binaries.

agents/plugins/mk_mysql

@@ -23,22 +23,22 @@ 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:+--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:+--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:+--socket="$1"} -sN \
         -e "SELECT table_schema, sum(data_length + index_length), sum(data_free)
             FROM information_schema.TABLES GROUP BY table_schema"
 
     echo "<<<mysql_slave>>>"
     echo "$INSTANCE_HEADER"
-    mysql --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -s \
+    $MYSQL --defaults-file="$MK_CONFDIR"/mysql.cfg ${1:+--socket="$1"} -s \
         -e "show slave status\G"
 
 }
@@ -51,31 +51,39 @@ if [ ! -f "${MK_CONFDIR}/mysql.local.cfg" ]; then
 EOF
 fi
 
-if type mysqladmin >/dev/null; then
-    mysql_socket_string=$(grep -F -h socket "$MK_CONFDIR"/mysql{.local,}.cfg | sed -ne 's/.*socket=\([^ ]*\).*/\1/p')
-    alias_string=$(grep -F -h alias "$MK_CONFDIR"/mysql{.local,}.cfg | sed -ne 's/.*aliases=\([^ ]*\).*/\1/p')
+if type mariadb-admin &>/dev/null; then
+    MYSQL=mariadb
+    MYSQLADMIN=mariadb-admin
+elif type mysqladmin &>/dev/null; then
+    MYSQL=mysql
+    MYSQLADMIN=mysqladmin
+else
+    exit 0
+fi
 
-    if [ -z "$mysql_socket_string" ]; then
-        mysql_socket_string=$(ps -fww -C mysqld | grep "socket" | sed -ne 's/.*socket=\([^ ]*\).*/\1/p')
-    fi
-    if [ -z "$mysql_socket_string" ]; then
-        do_query "" ""
-    else
-        IFS=" " mapfile -t mysql_sockets <<<"$mysql_socket_string"
-        IFS="," read -r -a aliases <<<"$alias_string"
+mysql_socket_string=$(grep -F -h socket "$MK_CONFDIR"/mysql{.local,}.cfg | sed -ne 's/.*socket=\([^ ]*\).*/\1/p')
+alias_string=$(grep -F -h alias "$MK_CONFDIR"/mysql{.local,}.cfg | sed -ne 's/.*aliases=\([^ ]*\).*/\1/p')
 
-        for i in "${!mysql_sockets[@]}"; do
-            socket="${mysql_sockets[i]}"
-            alias="${aliases[i]}"
-            if [ -z "$alias" ]; then
-                do_query "$socket" "$socket"
-            else
-                do_query "$socket" "$alias"
-            fi
-        done
-    fi
+if [ -z "$mysql_socket_string" ]; then
+    mysql_socket_string=$(ps -fww -C mysqld | grep "socket" | sed -ne 's/.*socket=\([^ ]*\).*/\1/p')
+fi
+if [ -z "$mysql_socket_string" ]; then
+    do_query "" ""
+else
+    IFS=" " mapfile -t mysql_sockets <<<"$mysql_socket_string"
+    IFS="," read -r -a aliases <<<"$alias_string"
 
-    # In async execution the cache file would be removed if the plugin exits with non-zero exit code.
-    # Avoid this from happening, just because the last mysql command failed (due to missing permissions).
-    exit 0
+    for i in "${!mysql_sockets[@]}"; do
+        socket="${mysql_sockets[i]}"
+        alias="${aliases[i]}"
+        if [ -z "$alias" ]; then
+            do_query "$socket" "$socket"
+        else
+            do_query "$socket" "$alias"
+        fi
+    done
 fi
+
+# In async execution the cache file would be removed if the plugin exits with non-zero exit code.
+# Avoid this from happening, just because the last mysql command failed (due to missing permissions).
+exit 0