From 599c137fd3d522793dc022644b8b6566b75628cb Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:11:06 +0100
Subject: clang-format

---
 plugins/check_mysql.c | 603 +++++++++++++++++++++++---------------------------
 1 file changed, 282 insertions(+), 321 deletions(-)

(limited to 'plugins')

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 8a73772d..09c0b7dd 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -1,34 +1,34 @@
 /*****************************************************************************
-* 
-* Monitoring check_mysql plugin
-* 
-* License: GPL
-* Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
-* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2024 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mysql plugin
-* 
-* This program tests connections to a mysql server
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_mysql plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
+ * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mysql plugin
+ *
+ * This program tests connections to a mysql server
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_mysql";
 const char *copyright = "1999-2024";
@@ -68,39 +68,24 @@ static double critical_time = 0;
 
 #define LENGTH_METRIC_UNIT 6
 static const char *metric_unit[LENGTH_METRIC_UNIT] = {
-	"Open_files",
-	"Open_tables",
-	"Qcache_free_memory",
-	"Qcache_queries_in_cache",
-	"Threads_connected",
-	"Threads_running"
-};
+	"Open_files", "Open_tables", "Qcache_free_memory", "Qcache_queries_in_cache", "Threads_connected", "Threads_running"};
 
 #define LENGTH_METRIC_COUNTER 9
 static const char *metric_counter[LENGTH_METRIC_COUNTER] = {
-	"Connections",
-	"Qcache_hits",
-	"Qcache_inserts",
-	"Qcache_lowmem_prunes",
-	"Qcache_not_cached",
-	"Queries",
-	"Questions",
-	"Table_locks_waited",
-	"Uptime"
-};
-
-#define MYSQLDUMP_THREADS_QUERY "SELECT COUNT(1) mysqldumpThreads FROM information_schema.processlist WHERE info LIKE 'SELECT /*!40001 SQL_NO_CACHE */%'"
+	"Connections", "Qcache_hits",        "Qcache_inserts", "Qcache_lowmem_prunes", "Qcache_not_cached", "Queries",
+	"Questions",   "Table_locks_waited", "Uptime"};
+
+#define MYSQLDUMP_THREADS_QUERY                                                                                                            \
+	"SELECT COUNT(1) mysqldumpThreads FROM information_schema.processlist WHERE info LIKE 'SELECT /*!40001 SQL_NO_CACHE */%'"
 
 static thresholds *my_threshold = NULL;
 
-static int process_arguments (int, char **);
-static int validate_arguments (void);
-static void print_help (void);
-void print_usage (void);
+static int process_arguments(int, char **);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
 
 	MYSQL mysql;
 	MYSQL_RES *res;
@@ -110,152 +95,152 @@ main (int argc, char **argv)
 
 	char *result = NULL;
 	char *error = NULL;
-	char slaveresult[SLAVERESULTSIZE] = { 0 };
-	char* perf;
+	char slaveresult[SLAVERESULTSIZE] = {0};
+	char *perf;
 
-	perf = strdup ("");
+	perf = strdup("");
 
-	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, LOCALEDIR);
-	textdomain (PACKAGE);
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
 
 	/* Parse extra opts if any */
-	argv=np_extra_opts (&argc, argv, progname);
+	argv = np_extra_opts(&argc, argv, progname);
 
-	if (process_arguments (argc, argv) == ERROR)
-		usage4 (_("Could not parse arguments"));
+	if (process_arguments(argc, argv) == ERROR) {
+		usage4(_("Could not parse arguments"));
+	}
 
 	/* initialize mysql  */
-	mysql_init (&mysql);
-	
-	if (opt_file != NULL)
-		mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
-
-	if (opt_group != NULL)
-		mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
-	else
-		mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
-
-	if (ssl)
-		mysql_ssl_set(&mysql,key,cert,ca_cert,ca_dir,ciphers);
+	mysql_init(&mysql);
+
+	if (opt_file != NULL) {
+		mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, opt_file);
+	}
+
+	if (opt_group != NULL) {
+		mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, opt_group);
+	} else {
+		mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
+	}
+
+	if (ssl) {
+		mysql_ssl_set(&mysql, key, cert, ca_cert, ca_dir, ciphers);
+	}
 	/* establish a connection to the server and error checking */
-	if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
+	if (!mysql_real_connect(&mysql, db_host, db_user, db_pass, db, db_port, db_socket, 0)) {
 		/* Depending on internally-selected auth plugin MySQL might return */
 		/* ER_ACCESS_DENIED_NO_PASSWORD_ERROR or ER_ACCESS_DENIED_ERROR. */
 		/* Semantically these errors are the same. */
-		if (ignore_auth && (mysql_errno (&mysql) == ER_ACCESS_DENIED_ERROR || mysql_errno (&mysql) == ER_ACCESS_DENIED_NO_PASSWORD_ERROR))
-		{
-			printf("MySQL OK - Version: %s (protocol %d)\n",
-				mysql_get_server_info(&mysql),
-				mysql_get_proto_info(&mysql)
-			);
-			mysql_close (&mysql);
+		if (ignore_auth && (mysql_errno(&mysql) == ER_ACCESS_DENIED_ERROR || mysql_errno(&mysql) == ER_ACCESS_DENIED_NO_PASSWORD_ERROR)) {
+			printf("MySQL OK - Version: %s (protocol %d)\n", mysql_get_server_info(&mysql), mysql_get_proto_info(&mysql));
+			mysql_close(&mysql);
 			return STATE_OK;
+		} else if (mysql_errno(&mysql) == CR_UNKNOWN_HOST) {
+			die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_VERSION_ERROR) {
+			die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY) {
+			die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR) {
+			die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR) {
+			die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+		} else {
+			die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
 		}
-		else if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
-			die (STATE_WARNING, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
-			die (STATE_WARNING, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_OUT_OF_MEMORY)
-			die (STATE_WARNING, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_IPSOCK_ERROR)
-			die (STATE_WARNING, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_SOCKET_CREATE_ERROR)
-			die (STATE_WARNING, "%s\n", mysql_error (&mysql));
-		else
-			die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
 	}
 
 	/* get the server stats */
-	result = strdup (mysql_stat (&mysql));
+	result = strdup(mysql_stat(&mysql));
 
 	/* error checking once more */
-	if (mysql_error (&mysql)) {
-		if (mysql_errno (&mysql) == CR_SERVER_GONE_ERROR)
-			die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_SERVER_LOST)
-			die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
-		else if (mysql_errno (&mysql) == CR_UNKNOWN_ERROR)
-			die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
+	if (mysql_error(&mysql)) {
+		if (mysql_errno(&mysql) == CR_SERVER_GONE_ERROR) {
+			die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_SERVER_LOST) {
+			die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+		} else if (mysql_errno(&mysql) == CR_UNKNOWN_ERROR) {
+			die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+		}
 	}
 
 	/* try to fetch some perf data */
-	if (mysql_query (&mysql, "show global status") == 0) {
-		if ( (res = mysql_store_result (&mysql)) == NULL) {
+	if (mysql_query(&mysql, "show global status") == 0) {
+		if ((res = mysql_store_result(&mysql)) == NULL) {
 			error = strdup(mysql_error(&mysql));
-			mysql_close (&mysql);
-			die (STATE_CRITICAL, _("status store_result error: %s\n"), error);
+			mysql_close(&mysql);
+			die(STATE_CRITICAL, _("status store_result error: %s\n"), error);
 		}
 
-		while ( (row = mysql_fetch_row (res)) != NULL) {
+		while ((row = mysql_fetch_row(res)) != NULL) {
 			int i;
 
-			for(i = 0; i < LENGTH_METRIC_UNIT; i++) {
+			for (i = 0; i < LENGTH_METRIC_UNIT; i++) {
 				if (strcmp(row[0], metric_unit[i]) == 0) {
-					xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i],
-						atol(row[1]), "", false, 0, false, 0, false, 0, false, 0));
+					xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i], atol(row[1]), "", false, 0, false, 0, false, 0, false, 0));
 					continue;
 				}
 			}
-			for(i = 0; i < LENGTH_METRIC_COUNTER; i++) {
+			for (i = 0; i < LENGTH_METRIC_COUNTER; i++) {
 				if (strcmp(row[0], metric_counter[i]) == 0) {
-					xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i],
-						atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0));
+					xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i], atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0));
 					continue;
 				}
 			}
 		}
 		/* remove trailing space */
-                if (strlen(perf) > 0)
-                    perf[strlen(perf) - 1] = '\0';
+		if (strlen(perf) > 0) {
+			perf[strlen(perf) - 1] = '\0';
+		}
 	}
 
-	if(check_slave) {
+	if (check_slave) {
 		/* check the slave status */
-		if (mysql_query (&mysql, "show slave status") != 0) {
+		if (mysql_query(&mysql, "show slave status") != 0) {
 			error = strdup(mysql_error(&mysql));
-			mysql_close (&mysql);
-			die (STATE_CRITICAL, _("slave query error: %s\n"), error);
+			mysql_close(&mysql);
+			die(STATE_CRITICAL, _("slave query error: %s\n"), error);
 		}
 
 		/* store the result */
-		if ( (res = mysql_store_result (&mysql)) == NULL) {
+		if ((res = mysql_store_result(&mysql)) == NULL) {
 			error = strdup(mysql_error(&mysql));
-			mysql_close (&mysql);
-			die (STATE_CRITICAL, _("slave store_result error: %s\n"), error);
+			mysql_close(&mysql);
+			die(STATE_CRITICAL, _("slave store_result error: %s\n"), error);
 		}
 
 		/* Check there is some data */
 		if (mysql_num_rows(res) == 0) {
 			mysql_close(&mysql);
-			die (STATE_WARNING, "%s\n", _("No slaves defined"));
+			die(STATE_WARNING, "%s\n", _("No slaves defined"));
 		}
 
 		/* fetch the first row */
-		if ( (row = mysql_fetch_row (res)) == NULL) {
+		if ((row = mysql_fetch_row(res)) == NULL) {
 			error = strdup(mysql_error(&mysql));
-			mysql_free_result (res);
-			mysql_close (&mysql);
-			die (STATE_CRITICAL, _("slave fetch row error: %s\n"), error);
+			mysql_free_result(res);
+			mysql_close(&mysql);
+			die(STATE_CRITICAL, _("slave fetch row error: %s\n"), error);
 		}
 
-		if (mysql_field_count (&mysql) == 12) {
+		if (mysql_field_count(&mysql) == 12) {
 			/* mysql 3.23.x */
-			snprintf (slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
-			if (strcmp (row[6], "Yes") != 0) {
-				mysql_free_result (res);
-				mysql_close (&mysql);
-				die (STATE_CRITICAL, "%s\n", slaveresult);
+			snprintf(slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
+			if (strcmp(row[6], "Yes") != 0) {
+				mysql_free_result(res);
+				mysql_close(&mysql);
+				die(STATE_CRITICAL, "%s\n", slaveresult);
 			}
 
 		} else {
 			/* mysql 4.x.x and mysql 5.x.x */
-			int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
-			MYSQL_FIELD* fields;
+			int slave_io_field = -1, slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
+			MYSQL_FIELD *fields;
 
 			num_fields = mysql_num_fields(res);
 			fields = mysql_fetch_fields(res);
-			for(i = 0; i < num_fields; i++) {
+			for (i = 0; i < num_fields; i++) {
 				if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
 					slave_io_field = i;
 					continue;
@@ -272,60 +257,59 @@ main (int argc, char **argv)
 
 			/* Check if slave status is available */
 			if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
-				mysql_free_result (res);
-				mysql_close (&mysql);
-				die (STATE_CRITICAL, "Slave status unavailable\n");
+				mysql_free_result(res);
+				mysql_close(&mysql);
+				die(STATE_CRITICAL, "Slave status unavailable\n");
 			}
 
 			/* Save slave status in slaveresult */
-			snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown");
+			snprintf(slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field],
+					 row[slave_sql_field], seconds_behind_field != -1 ? row[seconds_behind_field] : "Unknown");
 
 			/* Raise critical error if SQL THREAD or IO THREAD are stopped, but only if there are no mysqldump threads running */
-			if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
+			if (strcmp(row[slave_io_field], "Yes") != 0 || strcmp(row[slave_sql_field], "Yes") != 0) {
 				MYSQL_RES *res_mysqldump;
 				MYSQL_ROW row_mysqldump;
 				unsigned int mysqldump_threads = 0;
 
-				if (mysql_query (&mysql, MYSQLDUMP_THREADS_QUERY) == 0) {
+				if (mysql_query(&mysql, MYSQLDUMP_THREADS_QUERY) == 0) {
 					/* store the result */
-					if ( (res_mysqldump = mysql_store_result (&mysql)) != NULL) {
+					if ((res_mysqldump = mysql_store_result(&mysql)) != NULL) {
 						if (mysql_num_rows(res_mysqldump) == 1) {
-							if ( (row_mysqldump = mysql_fetch_row (res_mysqldump)) != NULL) {
+							if ((row_mysqldump = mysql_fetch_row(res_mysqldump)) != NULL) {
 								mysqldump_threads = atoi(row_mysqldump[0]);
 							}
 						}
 						/* free the result */
-						mysql_free_result (res_mysqldump);
+						mysql_free_result(res_mysqldump);
 					}
-					mysql_close (&mysql);
+					mysql_close(&mysql);
 				}
 				if (mysqldump_threads == 0) {
-					die (STATE_CRITICAL, "%s\n", slaveresult);
+					die(STATE_CRITICAL, "%s\n", slaveresult);
 				} else {
-					strncat(slaveresult, " Mysqldump: in progress", SLAVERESULTSIZE-1);
+					strncat(slaveresult, " Mysqldump: in progress", SLAVERESULTSIZE - 1);
 				}
 			}
 
-			if (verbose >=3) {
+			if (verbose >= 3) {
 				if (seconds_behind_field == -1) {
 					printf("seconds_behind_field not found\n");
 				} else {
-					printf ("seconds_behind_field(index %d)=%s\n", seconds_behind_field, row[seconds_behind_field]);
+					printf("seconds_behind_field(index %d)=%s\n", seconds_behind_field, row[seconds_behind_field]);
 				}
 			}
 
 			/* Check Seconds Behind against threshold */
-			if ((seconds_behind_field != -1) && (row[seconds_behind_field] != NULL && strcmp (row[seconds_behind_field], "NULL") != 0)) {
+			if ((seconds_behind_field != -1) && (row[seconds_behind_field] != NULL && strcmp(row[seconds_behind_field], "NULL") != 0)) {
 				double value = atof(row[seconds_behind_field]);
 				int status;
 
 				status = get_status(value, my_threshold);
 
-				xasprintf (&perf, "%s %s", perf, fperfdata ("seconds behind master", value, "s",
-							true, (double) warning_time,
-							true, (double) critical_time,
-							false, 0,
-							false, 0));
+				xasprintf(&perf, "%s %s", perf,
+						  fperfdata("seconds behind master", value, "s", true, (double)warning_time, true, (double)critical_time, false, 0,
+									false, 0));
 
 				if (status == STATE_WARNING) {
 					printf("SLOW_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf);
@@ -338,82 +322,66 @@ main (int argc, char **argv)
 		}
 
 		/* free the result */
-		mysql_free_result (res);
+		mysql_free_result(res);
 	}
 
 	/* close the connection */
-	mysql_close (&mysql);
+	mysql_close(&mysql);
 
 	/* print out the result of stats */
 	if (check_slave) {
-		printf ("%s %s|%s\n", result, slaveresult, perf);
+		printf("%s %s|%s\n", result, slaveresult, perf);
 	} else {
-		printf ("%s|%s\n", result, perf);
+		printf("%s|%s\n", result, perf);
 	}
 
 	return STATE_OK;
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
 	int c;
 	char *warning = NULL;
 	char *critical = NULL;
 
 	int option = 0;
-	static struct option longopts[] = {
-		{"hostname", required_argument, 0, 'H'},
-		{"socket", required_argument, 0, 's'},
-		{"database", required_argument, 0, 'd'},
-		{"username", required_argument, 0, 'u'},
-		{"password", required_argument, 0, 'p'},
-		{"file", required_argument, 0, 'f'},
-		{"group", required_argument, 0, 'g'},
-		{"port", required_argument, 0, 'P'},
-		{"critical", required_argument, 0, 'c'},
-		{"warning", required_argument, 0, 'w'},
-		{"check-slave", no_argument, 0, 'S'},
-		{"ignore-auth", no_argument, 0, 'n'},
-		{"verbose", no_argument, 0, 'v'},
-		{"version", no_argument, 0, 'V'},
-		{"help", no_argument, 0, 'h'},
-		{"ssl", no_argument, 0, 'l'},
-		{"ca-cert", optional_argument, 0, 'C'},
-		{"key", required_argument,0,'k'},
-		{"cert", required_argument,0,'a'},
-		{"ca-dir", required_argument, 0, 'D'},
-		{"ciphers", required_argument, 0, 'L'},
-		{0, 0, 0, 0}
-	};
-
-	if (argc < 1)
+	static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, {"socket", required_argument, 0, 's'},
+									   {"database", required_argument, 0, 'd'}, {"username", required_argument, 0, 'u'},
+									   {"password", required_argument, 0, 'p'}, {"file", required_argument, 0, 'f'},
+									   {"group", required_argument, 0, 'g'},    {"port", required_argument, 0, 'P'},
+									   {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
+									   {"check-slave", no_argument, 0, 'S'},    {"ignore-auth", no_argument, 0, 'n'},
+									   {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
+									   {"help", no_argument, 0, 'h'},           {"ssl", no_argument, 0, 'l'},
+									   {"ca-cert", optional_argument, 0, 'C'},  {"key", required_argument, 0, 'k'},
+									   {"cert", required_argument, 0, 'a'},     {"ca-dir", required_argument, 0, 'D'},
+									   {"ciphers", required_argument, 0, 'L'},  {0, 0, 0, 0}};
+
+	if (argc < 1) {
 		return ERROR;
+	}
 
 	while (1) {
-		c = getopt_long (argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
+		c = getopt_long(argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
 
-		if (c == -1 || c == EOF)
+		if (c == -1 || c == EOF) {
 			break;
+		}
 
 		switch (c) {
-		case 'H':									/* hostname */
-			if (is_host (optarg)) {
+		case 'H': /* hostname */
+			if (is_host(optarg)) {
 				db_host = optarg;
-			}
-			else if (*optarg == '/') {
+			} else if (*optarg == '/') {
 				db_socket = optarg;
-			}
-			else {
-				usage2 (_("Invalid hostname/address"), optarg);
+			} else {
+				usage2(_("Invalid hostname/address"), optarg);
 			}
 			break;
-		case 's':									/* socket */
+		case 's': /* socket */
 			db_socket = optarg;
 			break;
-		case 'd':									/* database */
+		case 'd': /* database */
 			db = optarg;
 			break;
 		case 'l':
@@ -434,10 +402,10 @@ process_arguments (int argc, char **argv)
 		case 'L':
 			ciphers = optarg;
 			break;
-		case 'u':									/* username */
+		case 'u': /* username */
 			db_user = optarg;
 			break;
-		case 'p':									/* authentication information: password */
+		case 'p': /* authentication information: password */
 			db_pass = strdup(optarg);
 
 			/* Delete the password from process list */
@@ -446,40 +414,40 @@ process_arguments (int argc, char **argv)
 				optarg++;
 			}
 			break;
-		case 'f':									/* client options file */
+		case 'f': /* client options file */
 			opt_file = optarg;
 			break;
-		case 'g':									/* client options group */
+		case 'g': /* client options group */
 			opt_group = optarg;
 			break;
-		case 'P':									/* critical time threshold */
-			db_port = atoi (optarg);
+		case 'P': /* critical time threshold */
+			db_port = atoi(optarg);
 			break;
 		case 'S':
-			check_slave = true;							/* check-slave */
+			check_slave = true; /* check-slave */
 			break;
 		case 'n':
-			ignore_auth = true;							/* ignore-auth */
+			ignore_auth = true; /* ignore-auth */
 			break;
 		case 'w':
 			warning = optarg;
-			warning_time = strtod (warning, NULL);
+			warning_time = strtod(warning, NULL);
 			break;
 		case 'c':
 			critical = optarg;
-			critical_time = strtod (critical, NULL);
+			critical_time = strtod(critical, NULL);
 			break;
-		case 'V':									/* version */
-			print_revision (progname, NP_VERSION);
-			exit (STATE_UNKNOWN);
-		case 'h':									/* help */
-			print_help ();
-			exit (STATE_UNKNOWN);
+		case 'V': /* version */
+			print_revision(progname, NP_VERSION);
+			exit(STATE_UNKNOWN);
+		case 'h': /* help */
+			print_help();
+			exit(STATE_UNKNOWN);
 		case 'v':
 			verbose++;
 			break;
-		case '?':									/* help */
-			usage5 ();
+		case '?': /* help */
+			usage5();
 		}
 	}
 
@@ -487,126 +455,119 @@ process_arguments (int argc, char **argv)
 
 	set_thresholds(&my_threshold, warning, critical);
 
-	while ( argc > c ) {
+	while (argc > c) {
 
-		if (db_host == NULL)
-			if (is_host (argv[c])) {
+		if (db_host == NULL) {
+			if (is_host(argv[c])) {
 				db_host = argv[c++];
+			} else {
+				usage2(_("Invalid hostname/address"), argv[c]);
 			}
-			else {
-				usage2 (_("Invalid hostname/address"), argv[c]);
-			}
-		else if (db_user == NULL)
+		} else if (db_user == NULL) {
 			db_user = argv[c++];
-		else if (db_pass == NULL)
+		} else if (db_pass == NULL) {
 			db_pass = argv[c++];
-		else if (db == NULL)
+		} else if (db == NULL) {
 			db = argv[c++];
-		else if (is_intnonneg (argv[c]))
-			db_port = atoi (argv[c++]);
-		else
+		} else if (is_intnonneg(argv[c])) {
+			db_port = atoi(argv[c++]);
+		} else {
 			break;
+		}
 	}
 
-	return validate_arguments ();
+	return validate_arguments();
 }
 
-
-int
-validate_arguments (void)
-{
-	if (db_user == NULL)
+int validate_arguments(void) {
+	if (db_user == NULL) {
 		db_user = strdup("");
+	}
 
-	if (db_host == NULL)
+	if (db_host == NULL) {
 		db_host = strdup("");
+	}
 
-	if (db == NULL)
+	if (db == NULL) {
 		db = strdup("");
+	}
 
 	return OK;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
 	char *myport;
-	xasprintf (&myport, "%d", MYSQL_PORT);
-
-	print_revision (progname, NP_VERSION);
-
-	printf (_(COPYRIGHT), copyright, email);
-
-	printf ("%s\n", _("This program tests connections to a MySQL server"));
-
-  printf ("\n\n");
-
-	print_usage ();
-
-  printf (UT_HELP_VRSN);
-	printf (UT_EXTRA_OPTS);
-
-  printf (UT_HOST_PORT, 'P', myport);
-  printf (" %s\n", "-n, --ignore-auth");
-  printf ("    %s\n", _("Ignore authentication failure and check for mysql connectivity only"));
-
-  printf (" %s\n", "-s, --socket=STRING");
-  printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
-
-  printf (" %s\n", "-d, --database=STRING");
-  printf ("    %s\n", _("Check database with indicated name"));
-  printf (" %s\n", "-f, --file=STRING");
-  printf ("    %s\n", _("Read from the specified client options file"));
-  printf (" %s\n", "-g, --group=STRING");
-  printf ("    %s\n", _("Use a client options group"));
-  printf (" %s\n", "-u, --username=STRING");
-  printf ("    %s\n", _("Connect using the indicated username"));
-  printf (" %s\n", "-p, --password=STRING");
-  printf ("    %s\n", _("Use the indicated password to authenticate the connection"));
-  printf ("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
-  printf ("    %s\n", _("Your clear-text password could be visible as a process table entry"));
-  printf (" %s\n", "-S, --check-slave");
-  printf ("    %s\n", _("Check if the slave thread is running properly."));
-  printf (" %s\n", "-w, --warning");
-  printf ("    %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds"));
-  printf ("    %s\n", _("behind master"));
-  printf (" %s\n", "-c, --critical");
-  printf ("    %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
-  printf ("    %s\n", _("behind master"));
-  printf (" %s\n", "-l, --ssl");
-  printf ("    %s\n", _("Use ssl encryption"));
-  printf (" %s\n", "-C, --ca-cert=STRING");
-  printf ("    %s\n", _("Path to CA signing the cert"));
-  printf (" %s\n", "-a, --cert=STRING");
-  printf ("    %s\n", _("Path to SSL certificate"));
-  printf (" %s\n", "-k, --key=STRING");
-  printf ("    %s\n", _("Path to private SSL key"));
-  printf (" %s\n", "-D, --ca-dir=STRING");
-  printf ("    %s\n", _("Path to CA directory"));
-  printf (" %s\n", "-L, --ciphers=STRING");
-  printf ("    %s\n", _("List of valid SSL ciphers"));
-
-
-  printf ("\n");
-  printf (" %s\n", _("There are no required arguments. By default, the local database is checked"));
-  printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
-  printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
-
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-	printf (" %s\n", _("overriding any my.cnf settings."));
-
-	printf (UT_SUPPORT);
+	xasprintf(&myport, "%d", MYSQL_PORT);
+
+	print_revision(progname, NP_VERSION);
+
+	printf(_(COPYRIGHT), copyright, email);
+
+	printf("%s\n", _("This program tests connections to a MySQL server"));
+
+	printf("\n\n");
+
+	print_usage();
+
+	printf(UT_HELP_VRSN);
+	printf(UT_EXTRA_OPTS);
+
+	printf(UT_HOST_PORT, 'P', myport);
+	printf(" %s\n", "-n, --ignore-auth");
+	printf("    %s\n", _("Ignore authentication failure and check for mysql connectivity only"));
+
+	printf(" %s\n", "-s, --socket=STRING");
+	printf("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
+
+	printf(" %s\n", "-d, --database=STRING");
+	printf("    %s\n", _("Check database with indicated name"));
+	printf(" %s\n", "-f, --file=STRING");
+	printf("    %s\n", _("Read from the specified client options file"));
+	printf(" %s\n", "-g, --group=STRING");
+	printf("    %s\n", _("Use a client options group"));
+	printf(" %s\n", "-u, --username=STRING");
+	printf("    %s\n", _("Connect using the indicated username"));
+	printf(" %s\n", "-p, --password=STRING");
+	printf("    %s\n", _("Use the indicated password to authenticate the connection"));
+	printf("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
+	printf("    %s\n", _("Your clear-text password could be visible as a process table entry"));
+	printf(" %s\n", "-S, --check-slave");
+	printf("    %s\n", _("Check if the slave thread is running properly."));
+	printf(" %s\n", "-w, --warning");
+	printf("    %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds"));
+	printf("    %s\n", _("behind master"));
+	printf(" %s\n", "-c, --critical");
+	printf("    %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
+	printf("    %s\n", _("behind master"));
+	printf(" %s\n", "-l, --ssl");
+	printf("    %s\n", _("Use ssl encryption"));
+	printf(" %s\n", "-C, --ca-cert=STRING");
+	printf("    %s\n", _("Path to CA signing the cert"));
+	printf(" %s\n", "-a, --cert=STRING");
+	printf("    %s\n", _("Path to SSL certificate"));
+	printf(" %s\n", "-k, --key=STRING");
+	printf("    %s\n", _("Path to private SSL key"));
+	printf(" %s\n", "-D, --ca-dir=STRING");
+	printf("    %s\n", _("Path to CA directory"));
+	printf(" %s\n", "-L, --ciphers=STRING");
+	printf("    %s\n", _("List of valid SSL ciphers"));
+
+	printf("\n");
+	printf(" %s\n", _("There are no required arguments. By default, the local database is checked"));
+	printf(" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
+	printf(" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
+
+	printf("\n");
+	printf("%s\n", _("Notes:"));
+	printf(" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+	printf(" %s\n", _("overriding any my.cnf settings."));
+
+	printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-	printf ("%s\n", _("Usage:"));
-  printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
-  printf ("       [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
+void print_usage(void) {
+	printf("%s\n", _("Usage:"));
+	printf(" %s [-d database] [-H host] [-P port] [-s socket]\n", progname);
+	printf("       [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
+	printf("       [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
 }
-- 
cgit v1.2.3-74-g34f1


From b8f203ace7ed09ac97fb98da63e71da07efb7354 Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Thu, 20 Feb 2025 18:05:36 +0100
Subject: Rename variable check_slave to check_replica

---
 plugins/check_mysql.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 09c0b7dd..6ba12feb 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -59,7 +59,7 @@ static bool ssl = false;
 static char *opt_file = NULL;
 static char *opt_group = NULL;
 static unsigned int db_port = MYSQL_PORT;
-static bool check_slave = false;
+static bool check_replica = false;
 static bool ignore_auth = false;
 static int verbose = 0;
 
@@ -195,7 +195,7 @@ int main(int argc, char **argv) {
 		}
 	}
 
-	if (check_slave) {
+	if (check_replica) {
 		/* check the slave status */
 		if (mysql_query(&mysql, "show slave status") != 0) {
 			error = strdup(mysql_error(&mysql));
@@ -329,7 +329,7 @@ int main(int argc, char **argv) {
 	mysql_close(&mysql);
 
 	/* print out the result of stats */
-	if (check_slave) {
+	if (check_replica) {
 		printf("%s %s|%s\n", result, slaveresult, perf);
 	} else {
 		printf("%s|%s\n", result, perf);
@@ -424,7 +424,7 @@ int process_arguments(int argc, char **argv) {
 			db_port = atoi(optarg);
 			break;
 		case 'S':
-			check_slave = true; /* check-slave */
+			check_replica = true; /* check-slave */
 			break;
 		case 'n':
 			ignore_auth = true; /* ignore-auth */
-- 
cgit v1.2.3-74-g34f1


From 97894cdd17962efe611c981de40eaab8c3b3e43a Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Thu, 20 Feb 2025 18:09:24 +0100
Subject: Add check-replica option for check_mysql, deprecate check_slave

This commit adds an option "check-replica" to check_mysql which
replaces "check-slave" (which still works).
The changes are introduced to follow the naming scheme of
MySQL/MariaDB, since this was changed there in version 8 (MySQL) or
10.5.1 (MariaDB).
---
 plugins/check_mysql.c | 92 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 37 deletions(-)

(limited to 'plugins')

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 6ba12feb..039a42e5 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -34,7 +34,7 @@ const char *progname = "check_mysql";
 const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-#define SLAVERESULTSIZE 96
+#define REPLICA_RESULTSIZE 96
 
 #include "common.h"
 #include "utils.h"
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
 
 	char *result = NULL;
 	char *error = NULL;
-	char slaveresult[SLAVERESULTSIZE] = {0};
+	char replica_result[REPLICA_RESULTSIZE] = {0};
 	char *perf;
 
 	perf = strdup("");
@@ -200,20 +200,20 @@ int main(int argc, char **argv) {
 		if (mysql_query(&mysql, "show slave status") != 0) {
 			error = strdup(mysql_error(&mysql));
 			mysql_close(&mysql);
-			die(STATE_CRITICAL, _("slave query error: %s\n"), error);
+			die(STATE_CRITICAL, _("replica query error: %s\n"), error);
 		}
 
 		/* store the result */
 		if ((res = mysql_store_result(&mysql)) == NULL) {
 			error = strdup(mysql_error(&mysql));
 			mysql_close(&mysql);
-			die(STATE_CRITICAL, _("slave store_result error: %s\n"), error);
+			die(STATE_CRITICAL, _("replica store_result error: %s\n"), error);
 		}
 
 		/* Check there is some data */
 		if (mysql_num_rows(res) == 0) {
 			mysql_close(&mysql);
-			die(STATE_WARNING, "%s\n", _("No slaves defined"));
+			die(STATE_WARNING, "%s\n", _("No replicas defined"));
 		}
 
 		/* fetch the first row */
@@ -221,32 +221,32 @@ int main(int argc, char **argv) {
 			error = strdup(mysql_error(&mysql));
 			mysql_free_result(res);
 			mysql_close(&mysql);
-			die(STATE_CRITICAL, _("slave fetch row error: %s\n"), error);
+			die(STATE_CRITICAL, _("replica fetch row error: %s\n"), error);
 		}
 
 		if (mysql_field_count(&mysql) == 12) {
 			/* mysql 3.23.x */
-			snprintf(slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
+			snprintf(replica_result, REPLICA_RESULTSIZE, _("Replica running: %s"), row[6]);
 			if (strcmp(row[6], "Yes") != 0) {
 				mysql_free_result(res);
 				mysql_close(&mysql);
-				die(STATE_CRITICAL, "%s\n", slaveresult);
+				die(STATE_CRITICAL, "%s\n", replica_result);
 			}
 
 		} else {
 			/* mysql 4.x.x and mysql 5.x.x */
-			int slave_io_field = -1, slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
+			int replica_io_field = -1, replica_sql_field = -1, seconds_behind_field = -1, i, num_fields;
 			MYSQL_FIELD *fields;
 
 			num_fields = mysql_num_fields(res);
 			fields = mysql_fetch_fields(res);
 			for (i = 0; i < num_fields; i++) {
 				if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
-					slave_io_field = i;
+					replica_io_field = i;
 					continue;
 				}
 				if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
-					slave_sql_field = i;
+					replica_sql_field = i;
 					continue;
 				}
 				if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
@@ -255,19 +255,19 @@ int main(int argc, char **argv) {
 				}
 			}
 
-			/* Check if slave status is available */
-			if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
+			/* Check if replica status is available */
+			if ((replica_io_field < 0) || (replica_sql_field < 0) || (num_fields == 0)) {
 				mysql_free_result(res);
 				mysql_close(&mysql);
-				die(STATE_CRITICAL, "Slave status unavailable\n");
+				die(STATE_CRITICAL, "Replica status unavailable\n");
 			}
 
-			/* Save slave status in slaveresult */
-			snprintf(slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field],
-					 row[slave_sql_field], seconds_behind_field != -1 ? row[seconds_behind_field] : "Unknown");
+			/* Save replica status in replica_result */
+			snprintf(replica_result, REPLICA_RESULTSIZE, "Replica IO: %s Replica SQL: %s Seconds Behind Master: %s", row[replica_io_field],
+					 row[replica_sql_field], seconds_behind_field != -1 ? row[seconds_behind_field] : "Unknown");
 
 			/* Raise critical error if SQL THREAD or IO THREAD are stopped, but only if there are no mysqldump threads running */
-			if (strcmp(row[slave_io_field], "Yes") != 0 || strcmp(row[slave_sql_field], "Yes") != 0) {
+			if (strcmp(row[replica_io_field], "Yes") != 0 || strcmp(row[replica_sql_field], "Yes") != 0) {
 				MYSQL_RES *res_mysqldump;
 				MYSQL_ROW row_mysqldump;
 				unsigned int mysqldump_threads = 0;
@@ -286,9 +286,9 @@ int main(int argc, char **argv) {
 					mysql_close(&mysql);
 				}
 				if (mysqldump_threads == 0) {
-					die(STATE_CRITICAL, "%s\n", slaveresult);
+					die(STATE_CRITICAL, "%s\n", replica_result);
 				} else {
-					strncat(slaveresult, " Mysqldump: in progress", SLAVERESULTSIZE - 1);
+					strncat(replica_result, " Mysqldump: in progress", REPLICA_RESULTSIZE - 1);
 				}
 			}
 
@@ -312,10 +312,10 @@ int main(int argc, char **argv) {
 									false, 0));
 
 				if (status == STATE_WARNING) {
-					printf("SLOW_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf);
+					printf("SLOW_REPLICA %s: %s|%s\n", _("WARNING"), replica_result, perf);
 					exit(STATE_WARNING);
 				} else if (status == STATE_CRITICAL) {
-					printf("SLOW_SLAVE %s: %s|%s\n", _("CRITICAL"), slaveresult, perf);
+					printf("SLOW_REPLICA %s: %s|%s\n", _("CRITICAL"), replica_result, perf);
 					exit(STATE_CRITICAL);
 				}
 			}
@@ -330,7 +330,7 @@ int main(int argc, char **argv) {
 
 	/* print out the result of stats */
 	if (check_replica) {
-		printf("%s %s|%s\n", result, slaveresult, perf);
+		printf("%s %s|%s\n", result, replica_result, perf);
 	} else {
 		printf("%s|%s\n", result, perf);
 	}
@@ -338,6 +338,8 @@ int main(int argc, char **argv) {
 	return STATE_OK;
 }
 
+#define CHECK_REPLICA_OPT CHAR_MAX + 1
+
 /* process command-line arguments */
 int process_arguments(int argc, char **argv) {
 	int c;
@@ -345,17 +347,29 @@ int process_arguments(int argc, char **argv) {
 	char *critical = NULL;
 
 	int option = 0;
-	static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, {"socket", required_argument, 0, 's'},
-									   {"database", required_argument, 0, 'd'}, {"username", required_argument, 0, 'u'},
-									   {"password", required_argument, 0, 'p'}, {"file", required_argument, 0, 'f'},
-									   {"group", required_argument, 0, 'g'},    {"port", required_argument, 0, 'P'},
-									   {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
-									   {"check-slave", no_argument, 0, 'S'},    {"ignore-auth", no_argument, 0, 'n'},
-									   {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
-									   {"help", no_argument, 0, 'h'},           {"ssl", no_argument, 0, 'l'},
-									   {"ca-cert", optional_argument, 0, 'C'},  {"key", required_argument, 0, 'k'},
-									   {"cert", required_argument, 0, 'a'},     {"ca-dir", required_argument, 0, 'D'},
-									   {"ciphers", required_argument, 0, 'L'},  {0, 0, 0, 0}};
+	static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+									   {"socket", required_argument, 0, 's'},
+									   {"database", required_argument, 0, 'd'},
+									   {"username", required_argument, 0, 'u'},
+									   {"password", required_argument, 0, 'p'},
+									   {"file", required_argument, 0, 'f'},
+									   {"group", required_argument, 0, 'g'},
+									   {"port", required_argument, 0, 'P'},
+									   {"critical", required_argument, 0, 'c'},
+									   {"warning", required_argument, 0, 'w'},
+									   {"check-slave", no_argument, 0, 'S'},
+									   {"check-replica", no_argument, 0, CHECK_REPLICA_OPT},
+									   {"ignore-auth", no_argument, 0, 'n'},
+									   {"verbose", no_argument, 0, 'v'},
+									   {"version", no_argument, 0, 'V'},
+									   {"help", no_argument, 0, 'h'},
+									   {"ssl", no_argument, 0, 'l'},
+									   {"ca-cert", optional_argument, 0, 'C'},
+									   {"key", required_argument, 0, 'k'},
+									   {"cert", required_argument, 0, 'a'},
+									   {"ca-dir", required_argument, 0, 'D'},
+									   {"ciphers", required_argument, 0, 'L'},
+									   {0, 0, 0, 0}};
 
 	if (argc < 1) {
 		return ERROR;
@@ -424,6 +438,7 @@ int process_arguments(int argc, char **argv) {
 			db_port = atoi(optarg);
 			break;
 		case 'S':
+		case CHECK_REPLICA_OPT:
 			check_replica = true; /* check-slave */
 			break;
 		case 'n':
@@ -532,12 +547,15 @@ void print_help(void) {
 	printf("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
 	printf("    %s\n", _("Your clear-text password could be visible as a process table entry"));
 	printf(" %s\n", "-S, --check-slave");
-	printf("    %s\n", _("Check if the slave thread is running properly."));
+	printf("    %s\n",
+		   _("Check if the slave thread is running properly. This option is deprecated in favour of check-replica, which does the same"));
+	printf(" %s\n", "--check-replica");
+	printf("    %s\n", _("Check if the replica thread is running properly."));
 	printf(" %s\n", "-w, --warning");
-	printf("    %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds"));
+	printf("    %s\n", _("Exit with WARNING status if replica server is more than INTEGER seconds"));
 	printf("    %s\n", _("behind master"));
 	printf(" %s\n", "-c, --critical");
-	printf("    %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
+	printf("    %s\n", _("Exit with CRITICAL status if replica server is more then INTEGER seconds"));
 	printf("    %s\n", _("behind master"));
 	printf(" %s\n", "-l, --ssl");
 	printf("    %s\n", _("Use ssl encryption"));
-- 
cgit v1.2.3-74-g34f1


From a517dc614e44650a7e9204c4202feec7a40fd37f Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:52:08 +0100
Subject: Add MySQL server version dectection and adaptive replica query

---
 plugins/check_mysql.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 039a42e5..2b6cfeaf 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -196,8 +196,56 @@ int main(int argc, char **argv) {
 	}
 
 	if (check_replica) {
-		/* check the slave status */
-		if (mysql_query(&mysql, "show slave status") != 0) {
+
+		// Detect which version we are, on older version
+		// "show slave status" should work, on newer ones
+		// "show replica status"
+		// But first we have to find out whether this is
+		// MySQL or MariaDB since the version numbering scheme
+		// is different
+		bool use_deprecated_slave_status = false;
+		const char *server_version = mysql_get_server_info(&mysql);
+		unsigned long server_verion_int = mysql_get_server_version(&mysql);
+		unsigned long major_version = server_verion_int / 10000;
+		unsigned long minor_version = (server_verion_int % 10000) / 100;
+		unsigned long patch_version = (server_verion_int % 100);
+		if (verbose) {
+			printf("Found MariaDB: %s, main version: %lu, minor version: %lu, patch version: %lu\n", server_version, major_version,
+				   minor_version, patch_version);
+		}
+
+		if (strstr(server_version, "MariaDB") != NULL) {
+			// Looks like MariaDB, new commands should be available after 10.5.1
+			if (major_version < 10) {
+				use_deprecated_slave_status = true;
+			} else if (major_version == 10) {
+				if (minor_version < 5) {
+					use_deprecated_slave_status = true;
+				} else if (minor_version == 5 && patch_version < 1) {
+					use_deprecated_slave_status = true;
+				}
+			}
+		} else if (strstr(server_version, "MySQL") != NULL) {
+			// Looks like MySQL
+			if (major_version < 8) {
+				use_deprecated_slave_status = true;
+			} else if (major_version == 10 && minor_version < 4) {
+				use_deprecated_slave_status = true;
+			}
+		} else {
+			printf("Not a known sever implementation: %s\n", server_version);
+			exit(STATE_UNKNOWN);
+		}
+
+		char *replica_query = NULL;
+		if (use_deprecated_slave_status) {
+			replica_query = "show slave status";
+		} else {
+			replica_query = "show replica status";
+		}
+
+		/* check the replica status */
+		if (mysql_query(&mysql, replica_query) != 0) {
 			error = strdup(mysql_error(&mysql));
 			mysql_close(&mysql);
 			die(STATE_CRITICAL, _("replica query error: %s\n"), error);
-- 
cgit v1.2.3-74-g34f1


From 3ed6b7cd3e99e328b9f34bfc4af8b2f8bd3b5231 Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Mon, 24 Feb 2025 20:55:18 +0100
Subject: check_mysql tests: Also exchange slave for replica

---
 .github/NPTest.cache    |  4 ++--
 plugins/t/check_mysql.t | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'plugins')

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index d488d1b9..6b463e74 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -38,8 +38,8 @@
   'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test',
   'NP_MYSQL_SERVER' => 'localhost',
   'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock',
-  'NP_MYSQL_WITH_SLAVE' => '',
-  'NP_MYSQL_WITH_SLAVE_LOGIN' => '',
+  'NP_MYSQL_WITH_REPLICA' => '',
+  'NP_MYSQL_WITH_REPLICA_LOGIN' => '',
   'NP_NO_NTP_SERVICE' => 'localhost',
   'NP_PORT_TCP_PROXY' => '3128',
   'NP_SMB_SHARE' => '',
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index baf3acc6..a383bc99 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -21,11 +21,11 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
 plan tests => 15;
 
 my $bad_login_output = '/Access denied for user /';
-my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no slaves setup");
-my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no slaves setup");
+my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no replica setup");
+my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no replica setup");
 my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access (requires REPLICATION CLIENT privileges)", "-u test -ptest");
-my $with_slave          = getTestParameter("NP_MYSQL_WITH_SLAVE", "MySQL server with slaves setup");
-my $with_slave_login    = getTestParameter("NP_MYSQL_WITH_SLAVE_LOGIN", "Login details for server with slave (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
+my $with_replica          = getTestParameter("NP_MYSQL_WITH_REPLICA", "MySQL server with replica setup");
+my $with_replica_login    = getTestParameter("NP_MYSQL_WITH_REPLICA_LOGIN", "Login details for server with replica (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
 
 my $result;
 
@@ -39,8 +39,8 @@ SKIP: {
 	like( $result->output, $bad_login_output, "Expected login failure message");
 
 	$result = NPTest->testCmd("./check_mysql -S -H $mysqlserver $mysql_login_details");
-	cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-	like( $result->output, "/No slaves defined/", "Correct error message");
+	cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+	like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
@@ -53,22 +53,22 @@ SKIP: {
 	like( $result->output, $bad_login_output, "Expected login failure message");
 
 	$result = NPTest->testCmd("./check_mysql -S -s $mysqlsocket $mysql_login_details");
-	cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-	like( $result->output, "/No slaves defined/", "Correct error message");
+	cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+	like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
-	skip "No mysql server with slaves defined", 5 unless $with_slave;
-	$result = NPTest->testCmd("./check_mysql -H $with_slave $with_slave_login");
+	skip "No mysql server with replicas defined", 5 unless $with_replica;
+	$result = NPTest->testCmd("./check_mysql -H $with_replica $with_replica_login");
 	cmp_ok( $result->return_code, '==', 0, "Login okay");
 
-	$result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login");
-	cmp_ok( $result->return_code, "==", 0, "Slaves okay" );
+	$result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login");
+	cmp_ok( $result->return_code, "==", 0, "Replicas okay" );
 
-	$result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60");
-	cmp_ok( $result->return_code, '==', 0, 'Slaves are not > 60 seconds behind');
+	$result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60");
+	cmp_ok( $result->return_code, '==', 0, 'Replicas are not > 60 seconds behind');
 
-	$result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60:");
+	$result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60:");
 	cmp_ok( $result->return_code, '==', 1, 'Alert warning if < 60 seconds behind');
-	like( $result->output, "/^SLOW_SLAVE WARNING:/", "Output okay");
+	like( $result->output, "/^SLOW_REPLICA WARNING:/", "Output okay");
 }
-- 
cgit v1.2.3-74-g34f1