X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=57ad23978de761297e235d3d87c28824a16b5b13;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hp=822c6cce7ece8a0c68d5bf78d49e97b7249279d2;hpb=d247bbb236a1033e49c6a214c8136876fb2d1b11;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index 822c6cce..bfdbb766 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -1,11 +1,14 @@
 /**
  * collectd - src/mysql.c
- * Copyright (C) 2006  Florian octo Forster
+ * Copyright (C) 2006-2009  Florian octo Forster
+ * Copyright (C) 2008       Mirko Buffoni
+ * Copyright (C) 2009       Doug MacEachern
+ * Copyright (C) 2009       Sebastian tokkee Harl
+ * Copyright (C) 2009       Rodolphe Quiédeville
  *
  * 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 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +21,10 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Mirko Buffoni <briareos at eswat.org>
+ *   Doug MacEachern <dougm at hyperic.com>
+ *   Sebastian tokkee Harl <sh at tokkee.org>
+ *   Rodolphe Quiédeville <rquiedeville at bearstech.com>
  **/
 
 #include "collectd.h"
@@ -25,324 +32,681 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#ifdef HAVE_MYSQL_MYSQL_H
+#ifdef HAVE_MYSQL_H
+#include <mysql.h>
+#elif defined(HAVE_MYSQL_MYSQL_H)
 #include <mysql/mysql.h>
 #endif
 
-#define MODULE_NAME "mysql"
+/* TODO: Understand `Select_*' and possibly do that stuff as well.. */
 
-#if COLLECT_LIBMYSQL
-# define MYSQL_HAVE_READ 1
-#else
-# define MYSQL_HAVE_READ 0
-#endif
+struct mysql_database_s /* {{{ */
+{
+	/* instance == NULL  =>  legacy mode */
+	char *instance;
+	char *host;
+	char *user;
+	char *pass;
+	char *database;
+	char *socket;
+	int   port;
+
+	int   master_stats;
+	int   slave_stats;
+
+	int   slave_notif;
+	int   slave_io_running;
+	int   slave_sql_running;
+
+	MYSQL *con;
+	int    state;
+};
+typedef struct mysql_database_s mysql_database_t; /* }}} */
 
-#define BUFSIZE 512
+static int mysql_read (user_data_t *ud);
 
-static char *host = "localhost";
-static char *user;
-static char *pass;
-static char *db = NULL;
+static void mysql_database_free (void *arg) /* {{{ */
+{
+	mysql_database_t *db;
 
-#if MYSQL_HAVE_READ
-static char  init_suceeded = 0;
-#endif
+	DEBUG ("mysql plugin: mysql_database_free (arg = %p);", arg);
 
-/* TODO
- * understand `Select_*' and possibly do that stuff as well..
- */
+	db = (mysql_database_t *) arg;
 
-static char *commands_file = "mysql/mysql_commands-%s.rrd";
-static char *handler_file  = "mysql/mysql_handler-%s.rrd";
-static char *qcache_file   = "mysql/mysql_qcache.rrd";
-static char *threads_file  = "mysql/mysql_threads.rrd";
-static char *traffic_file  = "traffic-mysql.rrd";
+	if (db == NULL)
+		return;
 
-static char *commands_ds_def[] =
-{
-	"DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int commands_ds_num = 1;
+	if (db->con != NULL)
+		mysql_close (db->con);
 
-static char *handler_ds_def[] =
-{
-	"DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int handler_ds_num = 1;
+	sfree (db->host);
+	sfree (db->user);
+	sfree (db->pass);
+	sfree (db->socket);
+	sfree (db->instance);
+	sfree (db->database);
+	sfree (db);
+} /* }}} void mysql_database_free */
 
-static char *qcache_ds_def[] =
-{
-	"DS:hits:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:inserts:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:not_cached:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:lowmem_prunes:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:queries_in_cache:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int qcache_ds_num = 5;
+/* Configuration handling functions {{{
+ *
+ * <Plugin mysql>
+ *   <Database "plugin_instance1">
+ *     Host "localhost"
+ *     Port 22000
+ *     ...
+ *   </Database>
+ * </Plugin>
+ */
 
-static char *threads_ds_def[] =
+static int mysql_config_set_string (char **ret_string, /* {{{ */
+				    oconfig_item_t *ci)
 {
-	"DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-	"DS:connected:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-	"DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-	"DS:created:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int threads_ds_num = 4;
+	char *string;
 
-static char *traffic_ds_def[] =
+	if ((ci->values_num != 1)
+	    || (ci->values[0].type != OCONFIG_TYPE_STRING))
+	{
+		WARNING ("mysql plugin: The `%s' config option "
+			 "needs exactly one string argument.", ci->key);
+		return (-1);
+	}
+
+	string = strdup (ci->values[0].value.string);
+	if (string == NULL)
+	{
+		ERROR ("mysql plugin: strdup failed.");
+		return (-1);
+	}
+
+	if (*ret_string != NULL)
+		free (*ret_string);
+	*ret_string = string;
+
+	return (0);
+} /* }}} int mysql_config_set_string */
+
+static int mysql_config_set_int (int *ret_int, /* {{{ */
+				 oconfig_item_t *ci)
 {
-	"DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int traffic_ds_num = 2;
+	if ((ci->values_num != 1)
+	    || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
+	{
+		WARNING ("mysql plugin: The `%s' config option "
+			 "needs exactly one string argument.", ci->key);
+		return (-1);
+	}
+
+	*ret_int = ci->values[0].value.number;
 
-static char *config_keys[] =
+	return (0);
+} /* }}} int mysql_config_set_int */
+
+static int mysql_config_set_boolean (int *ret_boolean, /* {{{ */
+				oconfig_item_t *ci)
 {
-	"Host",
-	"User",
-	"Password",
-	"Database",
-	NULL
-};
-static int config_keys_num = 4;
+	int status = 0;
+
+	if (ci->values_num != 1)
+		status = -1;
+
+	if (status == 0)
+	{
+		if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN)
+			*ret_boolean = ci->values[0].value.boolean;
+		else if (ci->values[0].type == OCONFIG_TYPE_STRING)
+		{
+			if (IS_TRUE (ci->values[0].value.string))
+				*ret_boolean = 1;
+			else if (IS_FALSE (ci->values[0].value.string))
+				*ret_boolean = 0;
+			else
+				status = -1;
+		}
+		else
+			status = -1;
+	}
 
-#if MYSQL_HAVE_READ
-static MYSQL *getconnection (void)
+	if (status != 0)
+	{
+		WARNING ("mysql plugin: The `%s' config option "
+			"needs exactly one boolean argument.", ci->key);
+		return (-1);
+	}
+	return (0);
+} /* }}} mysql_config_set_boolean */
+
+static int mysql_config (oconfig_item_t *ci) /* {{{ */
 {
-	static MYSQL *con;
-	static int    state;
+	mysql_database_t *db;
+	int plugin_block;
+	int status = 0;
+	int i;
 
-	if (state != 0)
+	if ((ci->values_num != 1)
+	    || (ci->values[0].type != OCONFIG_TYPE_STRING))
+	{
+		WARNING ("mysql plugin: The `Database' block "
+			 "needs exactly one string argument.");
+		return (-1);
+	}
+
+	db = (mysql_database_t *) malloc (sizeof (*db));
+	if (db == NULL)
+	{
+		ERROR ("mysql plugin: malloc failed.");
+		return (-1);
+	}
+	memset (db, 0, sizeof (*db));
+
+	/* initialize all the pointers */
+	db->host     = NULL;
+	db->user     = NULL;
+	db->pass     = NULL;
+	db->database = NULL;
+	db->socket   = NULL;
+	db->con      = NULL;
+
+	/* trigger a notification, if it's not running */
+	db->slave_io_running  = 1;
+	db->slave_sql_running = 1;
+
+	plugin_block = 1;
+	if (strcasecmp ("Plugin", ci->key) == 0)
+	{
+		db->instance = NULL;
+	}
+	else if (strcasecmp ("Database", ci->key) == 0)
+	{
+		plugin_block = 0;
+		status = mysql_config_set_string (&db->instance, ci);
+		if (status != 0)
+		{
+			sfree (db);
+			return (status);
+		}
+		assert (db->instance != NULL);
+	}
+	else
+	{
+		ERROR ("mysql plugin: mysql_config: "
+				"Invalid key: %s", ci->key);
+		return (-1);
+	}
+
+	/* Fill the `mysql_database_t' structure.. */
+	for (i = 0; i < ci->children_num; i++)
+	{
+		oconfig_item_t *child = ci->children + i;
+
+		if (strcasecmp ("Host", child->key) == 0)
+			status = mysql_config_set_string (&db->host, child);
+		else if (strcasecmp ("User", child->key) == 0)
+			status = mysql_config_set_string (&db->user, child);
+		else if (strcasecmp ("Password", child->key) == 0)
+			status = mysql_config_set_string (&db->pass, child);
+		else if (strcasecmp ("Port", child->key) == 0)
+			status = mysql_config_set_int (&db->port, child);
+		else if (strcasecmp ("Socket", child->key) == 0)
+			status = mysql_config_set_string (&db->socket, child);
+		/* Check if we're currently handling the `Plugin' block. If so,
+		 * handle `Database' _blocks_, too. */
+		else if ((plugin_block != 0)
+				&& (strcasecmp ("Database", child->key) == 0)
+				&& (child->children != NULL))
+		{
+			/* If `plugin_block > 1', there has been at least one
+			 * `Database' block */
+			plugin_block++;
+			status = mysql_config (child);
+		}
+		/* Now handle ordinary `Database' options (without children) */
+		else if ((strcasecmp ("Database", child->key) == 0)
+				&& (child->children == NULL))
+			status = mysql_config_set_string (&db->database, child);
+		else if (strcasecmp ("MasterStats", child->key) == 0)
+			status = mysql_config_set_boolean (&db->master_stats, child);
+		else if (strcasecmp ("SlaveStats", child->key) == 0)
+			status = mysql_config_set_boolean (&db->slave_stats, child);
+		else if (strcasecmp ("SlaveNotifications", child->key) == 0)
+			status = mysql_config_set_boolean (&db->slave_notif, child);
+		else
+		{
+			WARNING ("mysql plugin: Option `%s' not allowed here.", child->key);
+			status = -1;
+		}
+
+		if (status != 0)
+			break;
+	}
+
+	/* Check if there were any `Database' blocks. */
+	if (plugin_block > 1)
+	{
+		/* There were connection blocks. Don't use any legacy stuff. */
+		if ((db->host != NULL)
+			|| (db->user != NULL)
+			|| (db->pass != NULL)
+			|| (db->database != NULL)
+			|| (db->socket != NULL)
+			|| (db->port != 0))
+		{
+			WARNING ("mysql plugin: At least one <Database> "
+					"block has been found. The legacy "
+					"configuration will be ignored.");
+		}
+		mysql_database_free (db);
+		return (0);
+	}
+	else if (plugin_block != 0)
+	{
+		WARNING ("mysql plugin: You're using the legacy "
+				"configuration options. Please consider "
+				"updating your configuration!");
+	}
+
+	/* Check that all necessary options have been given. */
+	while (status == 0)
+	{
+		/* Zero is allowed and automatically handled by
+		 * `mysql_real_connect'. */
+		if ((db->port < 0) || (db->port > 65535))
+		{
+			ERROR ("mysql plugin: Database %s: Port number out "
+					"of range: %i",
+					(db->instance != NULL)
+					? db->instance
+					: "<legacy>",
+					db->port);
+			status = -1;
+		}
+		break;
+	} /* while (status == 0) */
+
+	/* If all went well, register this database for reading */
+	if (status == 0)
+	{
+		user_data_t ud;
+		char cb_name[DATA_MAX_NAME_LEN];
+
+		DEBUG ("mysql plugin: Registering new read callback: %s",
+				(db->database != NULL) ? db->database : "<default>");
+
+		memset (&ud, 0, sizeof (ud));
+		ud.data = (void *) db;
+		ud.free_func = mysql_database_free;
+
+		if (db->database != NULL)
+			ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
+					db->database);
+		else
+			sstrncpy (cb_name, "mysql", sizeof (cb_name));
+
+		plugin_register_complex_read (/* group = */ NULL, cb_name,
+					      mysql_read,
+					      /* interval = */ NULL, &ud);
+	}
+	else
+	{
+		mysql_database_free (db);
+		return (-1);
+	}
+
+	return (0);
+} /* }}} int mysql_config */
+
+/* }}} End of configuration handling functions */
+
+static MYSQL *getconnection (mysql_database_t *db)
+{
+	if (db->state != 0)
 	{
 		int err;
-		if ((err = mysql_ping (con)) != 0)
+		if ((err = mysql_ping (db->con)) != 0)
 		{
-			syslog (LOG_WARNING, "mysql_ping failed: %s", mysql_error (con));
-			state = 0;
+			WARNING ("mysql_ping failed for %s: %s",
+					(db->instance != NULL)
+					? db->instance
+					: "<legacy>",
+					mysql_error (db->con));
+			db->state = 0;
 		}
 		else
 		{
-			state = 1;
-			return (con);
+			db->state = 1;
+			return (db->con);
 		}
 	}
 
-	if ((con = mysql_init (con)) == NULL)
+	if ((db->con = mysql_init (db->con)) == NULL)
 	{
-		syslog (LOG_ERR, "mysql_init failed: %s", mysql_error (con));
-		state = 0;
+		ERROR ("mysql_init failed: %s", mysql_error (db->con));
+		db->state = 0;
 		return (NULL);
 	}
 
-	if (mysql_real_connect (con, host, user, pass, db, 0, NULL, 0) == NULL)
+	if (mysql_real_connect (db->con, db->host, db->user, db->pass,
+				db->database, db->port, db->socket, 0) == NULL)
 	{
-		syslog (LOG_ERR, "mysql_real_connect failed: %s", mysql_error (con));
-		state = 0;
+		ERROR ("mysql plugin: Failed to connect to database %s "
+				"at server %s: %s",
+				(db->database != NULL) ? db->database : "<none>",
+				(db->host != NULL) ? db->host : "localhost",
+				mysql_error (db->con));
+		db->state = 0;
 		return (NULL);
 	}
 	else
 	{
-		state = 1;
-		return (con);
+		INFO ("mysql plugin: Successfully connected to database %s "
+				"at server %s (server version: %s, protocol version: %d)",
+				(db->database != NULL) ? db->database : "<none>",
+				mysql_get_host_info (db->con),
+				mysql_get_server_info (db->con),
+				mysql_get_proto_info (db->con));
+		db->state = 1;
+		return (db->con);
 	}
-} /* static MYSQL *getconnection (void) */
-#endif /* MYSQL_HAVE_READ */
+} /* static MYSQL *getconnection (mysql_database_t *db) */
 
-static void init (void)
+static void set_host (mysql_database_t *db, char *buf, size_t buflen)
 {
-#if MYSQL_HAVE_READ
-	if (getconnection () != NULL)
-		init_suceeded = 1;
+	/* XXX legacy mode - use hostname_g */
+	if (db->instance == NULL)
+		sstrncpy (buf, hostname_g, buflen);
 	else
 	{
-		syslog (LOG_ERR, "The `mysql' plugin will be disabled because `init' failed to connect to `%s'", host);
-		init_suceeded = 0;
+		if ((db->host == NULL)
+				|| (strcmp ("", db->host) == 0)
+				|| (strcmp ("localhost", db->host) == 0))
+			sstrncpy (buf, hostname_g, buflen);
+		else
+			sstrncpy (buf, db->host, buflen);
 	}
-#endif /* MYSQL_HAVE_READ */
-
-	return;
 }
 
-static int config (char *key, char *value)
+static void set_plugin_instance (mysql_database_t *db,
+		char *buf, size_t buflen)
 {
-	if (strcasecmp (key, "host") == 0)
-		return ((host = strdup (value)) == NULL ? 1 : 0);
-	else if (strcasecmp (key, "user") == 0)
-		return ((user = strdup (value)) == NULL ? 1 : 0);
-	else if (strcasecmp (key, "password") == 0)
-		return ((pass = strdup (value)) == NULL ? 1 : 0);
-	else if (strcasecmp (key, "database") == 0)
-		return ((db = strdup (value)) == NULL ? 1 : 0);
+	/* XXX legacy mode - no plugin_instance */
+	if (db->instance == NULL)
+		sstrncpy (buf, "", buflen);
 	else
-		return (-1);
+		sstrncpy (buf, db->instance, buflen);
 }
 
-static void commands_write (char *host, char *inst, char *val)
+static void submit (const char *type, const char *type_instance,
+		value_t *values, size_t values_len, mysql_database_t *db)
 {
-	char buf[BUFSIZE];
+	value_list_t vl = VALUE_LIST_INIT;
 
-	if (snprintf (buf, BUFSIZE, commands_file, inst) >= BUFSIZE)
-		return;
+	vl.values     = values;
+	vl.values_len = values_len;
 
-	rrd_update_file (host, buf, val, commands_ds_def, commands_ds_num);
-}
+	set_host (db, vl.host, sizeof (vl.host));
 
-static void handler_write (char *host, char *inst, char *val)
-{
-	char buf[BUFSIZE];
+	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	set_plugin_instance (db, vl.plugin_instance, sizeof (vl.plugin_instance));
 
-	if (snprintf (buf, BUFSIZE, handler_file, inst) >= BUFSIZE)
-		return;
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	if (type_instance != NULL)
+		sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	rrd_update_file (host, buf, val, handler_ds_def, handler_ds_num);
-}
+	plugin_dispatch_values (&vl);
+} /* submit */
 
-static void qcache_write (char *host, char *inst, char *val)
+static void counter_submit (const char *type, const char *type_instance,
+		counter_t value, mysql_database_t *db)
 {
-	rrd_update_file (host, qcache_file, val,
-			qcache_ds_def, qcache_ds_num);
-}
+	value_t values[1];
+
+	values[0].counter = value;
+	submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db);
+} /* void counter_submit */
 
-static void threads_write (char *host, char *inst, char *val)
+static void gauge_submit (const char *type, const char *type_instance,
+		gauge_t value, mysql_database_t *db)
 {
-	rrd_update_file (host, threads_file, val,
-			threads_ds_def, threads_ds_num);
-}
+	value_t values[1];
+
+	values[0].gauge = value;
+	submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db);
+} /* void gauge_submit */
 
-static void traffic_write (char *host, char *inst, char *val)
+static void qcache_submit (counter_t hits, counter_t inserts,
+		counter_t not_cached, counter_t lowmem_prunes,
+		gauge_t queries_in_cache, mysql_database_t *db)
 {
-	rrd_update_file (host, traffic_file, val,
-			traffic_ds_def, traffic_ds_num);
-}
+	value_t values[5];
+
+	values[0].counter = hits;
+	values[1].counter = inserts;
+	values[2].counter = not_cached;
+	values[3].counter = lowmem_prunes;
+	values[4].gauge   = queries_in_cache;
+
+	submit ("mysql_qcache", NULL, values, STATIC_ARRAY_SIZE (values), db);
+} /* void qcache_submit */
 
-#if MYSQL_HAVE_READ
-static void commands_submit (char *inst, unsigned long long value)
+static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
+		counter_t created, mysql_database_t *db)
 {
-	char buf[BUFSIZE];
-	int  status;
+	value_t values[4];
 
-	status = snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, value);
+	values[0].gauge   = running;
+	values[1].gauge   = connected;
+	values[2].gauge   = cached;
+	values[3].counter = created;
 
-	if (status < 0)
-	{
-		syslog (LOG_ERR, "snprintf failed");
-		return;
-	}
-	else if (status >= BUFSIZE)
-	{
-		syslog (LOG_WARNING, "snprintf was truncated");
-		return;
-	}
+	submit ("mysql_threads", NULL, values, STATIC_ARRAY_SIZE (values), db);
+} /* void threads_submit */
 
-	plugin_submit ("mysql_commands", inst, buf);
-}
+static void traffic_submit (counter_t rx, counter_t tx, mysql_database_t *db)
+{
+	value_t values[2];
+
+	values[0].counter = rx;
+	values[1].counter = tx;
 
-static void handler_submit (char *inst, unsigned long long value)
+	submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db);
+} /* void traffic_submit */
+
+static MYSQL_RES *exec_query (MYSQL *con, const char *query)
 {
-	char buf[BUFSIZE];
-	int  status;
+	MYSQL_RES *res;
 
-	status = snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, value);
+	int query_len = strlen (query);
 
-	if (status < 0)
+	if (mysql_real_query (con, query, query_len))
 	{
-		syslog (LOG_ERR, "snprintf failed");
-		return;
+		ERROR ("mysql plugin: Failed to execute query: %s",
+				mysql_error (con));
+		INFO ("mysql plugin: SQL query was: %s", query);
+		return (NULL);
 	}
-	else if (status >= BUFSIZE)
+
+	res = mysql_store_result (con);
+	if (res == NULL)
 	{
-		syslog (LOG_WARNING, "snprintf was truncated");
-		return;
+		ERROR ("mysql plugin: Failed to store query result: %s",
+				mysql_error (con));
+		INFO ("mysql plugin: SQL query was: %s", query);
+		return (NULL);
 	}
 
-	plugin_submit ("mysql_handler", inst, buf);
-}
+	return (res);
+} /* exec_query */
 
-static void qcache_submit (unsigned long long hits, unsigned long long inserts,
-		unsigned long long not_cached, unsigned long long lowmem_prunes,
-		int queries_in_cache)
+static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con)
 {
-	char buf[BUFSIZE];
-	int  status;
+	MYSQL_RES *res;
+	MYSQL_ROW  row;
 
-	status = snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%i",
-			(unsigned int) curtime, hits, inserts, not_cached,
-			lowmem_prunes, queries_in_cache);
+	char *query;
+	int   field_num;
+	unsigned long long position;
 
-	if (status < 0)
+	query = "SHOW MASTER STATUS";
+
+	res = exec_query (con, query);
+	if (res == NULL)
+		return (-1);
+
+	row = mysql_fetch_row (res);
+	if (row == NULL)
 	{
-		syslog (LOG_ERR, "snprintf failed");
-		return;
+		ERROR ("mysql plugin: Failed to get master statistics: "
+				"`%s' did not return any rows.", query);
+		return (-1);
 	}
-	else if (status >= BUFSIZE)
+
+	field_num = mysql_num_fields (res);
+	if (field_num < 2)
 	{
-		syslog (LOG_WARNING, "snprintf was truncated");
-		return;
+		ERROR ("mysql plugin: Failed to get master statistics: "
+				"`%s' returned less than two columns.", query);
+		return (-1);
 	}
 
-	plugin_submit ("mysql_qcache", "-", buf);
-}
+	position = atoll (row[1]);
+	counter_submit ("mysql_log_position", "master-bin", position, db);
+
+	row = mysql_fetch_row (res);
+	if (row != NULL)
+		WARNING ("mysql plugin: `%s' returned more than one row - "
+				"ignoring further results.", query);
 
-static void threads_submit (int running, int connected, int cached,
-		unsigned long long created)
+	mysql_free_result (res);
+
+	return (0);
+} /* mysql_read_master_stats */
+
+static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
 {
-	char buf[BUFSIZE];
-	int  status;
+	MYSQL_RES *res;
+	MYSQL_ROW  row;
 
-	status = snprintf (buf, BUFSIZE, "%u:%i:%i:%i:%llu",
-			(unsigned int) curtime,
-			running, connected, cached, created);
+	char *query;
+	int   field_num;
 
-	if (status < 0)
+	/* WTF? libmysqlclient does not seem to provide any means to
+	 * translate a column name to a column index ... :-/ */
+	const int READ_MASTER_LOG_POS_IDX   = 6;
+	const int SLAVE_IO_RUNNING_IDX      = 10;
+	const int SLAVE_SQL_RUNNING_IDX     = 11;
+	const int EXEC_MASTER_LOG_POS_IDX   = 21;
+	const int SECONDS_BEHIND_MASTER_IDX = 32;
+
+	query = "SHOW SLAVE STATUS";
+
+	res = exec_query (con, query);
+	if (res == NULL)
+		return (-1);
+
+	row = mysql_fetch_row (res);
+	if (row == NULL)
 	{
-		syslog (LOG_ERR, "snprintf failed");
-		return;
+		ERROR ("mysql plugin: Failed to get slave statistics: "
+				"`%s' did not return any rows.", query);
+		return (-1);
 	}
-	else if (status >= BUFSIZE)
+
+	field_num = mysql_num_fields (res);
+	if (field_num < 33)
 	{
-		syslog (LOG_WARNING, "snprintf was truncated");
-		return;
+		ERROR ("mysql plugin: Failed to get slave statistics: "
+				"`%s' returned less than 33 columns.", query);
+		return (-1);
 	}
 
-	plugin_submit ("mysql_threads", "-", buf);
-}
+	if (db->slave_stats)
+	{
+		unsigned long long counter;
+		double gauge;
 
-static void traffic_submit (unsigned long long incoming,
-		unsigned long long outgoing)
-{
-	char buf[BUFSIZE];
-	int  status;
+		counter = atoll (row[READ_MASTER_LOG_POS_IDX]);
+		counter_submit ("mysql_log_position", "slave-read", counter, db);
 
-	status = snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime,
-			incoming, outgoing);
+		counter = atoll (row[EXEC_MASTER_LOG_POS_IDX]);
+		counter_submit ("mysql_log_position", "slave-exec", counter, db);
 
-	if (status < 0)
-	{
-		syslog (LOG_ERR, "snprintf failed");
-		return;
+		if (row[SECONDS_BEHIND_MASTER_IDX] != NULL)
+		{
+			gauge = atof (row[SECONDS_BEHIND_MASTER_IDX]);
+			gauge_submit ("time_offset", NULL, gauge, db);
+		}
 	}
-	else if (status >= BUFSIZE)
+
+	if (db->slave_notif)
 	{
-		syslog (LOG_WARNING, "snprintf was truncated");
-		return;
+		notification_t n = { 0, time (NULL), "", "",
+			"mysql", "", "time_offset", "", NULL };
+
+		char *io, *sql;
+
+		io  = row[SLAVE_IO_RUNNING_IDX];
+		sql = row[SLAVE_SQL_RUNNING_IDX];
+
+		set_host (db, n.host, sizeof (n.host));
+		set_plugin_instance (db,
+				n.plugin_instance, sizeof (n.plugin_instance));
+
+		if (((io == NULL) || (strcasecmp (io, "yes") != 0))
+				&& (db->slave_io_running))
+		{
+			n.severity = NOTIF_WARNING;
+			ssnprintf (n.message, sizeof (n.message),
+					"slave I/O thread not started or not connected to master");
+			plugin_dispatch_notification (&n);
+			db->slave_io_running = 0;
+		}
+		else if (((io != NULL) && (strcasecmp (io, "yes") == 0))
+				&& (! db->slave_io_running))
+		{
+			n.severity = NOTIF_OKAY;
+			ssnprintf (n.message, sizeof (n.message),
+					"slave I/O thread started and connected to master");
+			plugin_dispatch_notification (&n);
+			db->slave_io_running = 1;
+		}
+
+		if (((sql == NULL) || (strcasecmp (sql, "yes") != 0))
+				&& (db->slave_sql_running))
+		{
+			n.severity = NOTIF_WARNING;
+			ssnprintf (n.message, sizeof (n.message),
+					"slave SQL thread not started");
+			plugin_dispatch_notification (&n);
+			db->slave_sql_running = 0;
+		}
+		else if (((sql != NULL) && (strcasecmp (sql, "yes") == 0))
+				&& (! db->slave_sql_running))
+		{
+			n.severity = NOTIF_OKAY;
+			ssnprintf (n.message, sizeof (n.message),
+					"slave SQL thread started");
+			plugin_dispatch_notification (&n);
+			db->slave_sql_running = 0;
+		}
 	}
 
-	plugin_submit ("mysql_traffic", "-", buf);
-}
+	row = mysql_fetch_row (res);
+	if (row != NULL)
+		WARNING ("mysql plugin: `%s' returned more than one row - "
+				"ignoring further results.", query);
+
+	mysql_free_result (res);
+
+	return (0);
+} /* mysql_read_slave_stats */
 
-static void mysql_read (void)
+static int mysql_read (user_data_t *ud)
 {
+	mysql_database_t *db;
 	MYSQL     *con;
 	MYSQL_RES *res;
 	MYSQL_ROW  row;
 	char      *query;
-	int        query_len;
-	int        field_num;
 
 	unsigned long long qcache_hits          = 0ULL;
 	unsigned long long qcache_inserts       = 0ULL;
@@ -358,34 +722,27 @@ static void mysql_read (void)
 	unsigned long long traffic_incoming = 0ULL;
 	unsigned long long traffic_outgoing = 0ULL;
 
-	if (init_suceeded == 0)
-		return;
+	if ((ud == NULL) || (ud->data == NULL))
+	{
+		ERROR ("mysql plugin: mysql_database_read: Invalid user data.");
+		return (-1);
+	}
+
+	db = (mysql_database_t *) ud->data;
 
 	/* An error message will have been printed in this case */
-	if ((con = getconnection ()) == NULL)
-		return;
+	if ((con = getconnection (db)) == NULL)
+		return (-1);
 
 	query = "SHOW STATUS";
 	if (mysql_get_server_version (con) >= 50002)
 		query = "SHOW GLOBAL STATUS";
 
-	query_len = strlen (query);
-
-	if (mysql_real_query (con, query, query_len))
-	{
-		syslog (LOG_ERR, "mysql_real_query failed: %s\n",
-				mysql_error (con));
-		return;
-	}
-
-	if ((res = mysql_store_result (con)) == NULL)
-	{
-		syslog (LOG_ERR, "mysql_store_result failed: %s\n",
-				mysql_error (con));
-		return;
-	}
+	res = exec_query (con, query);
+	if (res == NULL)
+		return (-1);
 
-	field_num = mysql_num_fields (res);
+	mysql_num_fields (res);
 	while ((row = mysql_fetch_row (res)))
 	{
 		char *key;
@@ -394,23 +751,30 @@ static void mysql_read (void)
 		key = row[0];
 		val = atoll (row[1]);
 
-		if (strncmp (key, "Com_", 4) == 0)
+		if (strncmp (key, "Com_", 
+			          strlen ("Com_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
 			/* Ignore `prepared statements' */
-			if (strncmp (key, "Com_stmt_", 9) != 0)
-				commands_submit (key + 4, val);
+			if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0)
+				counter_submit ("mysql_commands", 
+						key + strlen ("Com_"), 
+						val, db);
 		}
-		else if (strncmp (key, "Handler_", 8) == 0)
+		else if (strncmp (key, "Handler_", 
+				        strlen ("Handler_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
-			handler_submit (key + 8, val);
+			counter_submit ("mysql_handler", 
+					key + strlen ("Handler_"), 
+					val, db);
 		}
-		else if (strncmp (key, "Qcache_", 7) == 0)
+		else if (strncmp (key, "Qcache_",
+       				        strlen ("Qcache_")) == 0)
 		{
 			if (strcmp (key, "Qcache_hits") == 0)
 				qcache_hits = val;
@@ -423,14 +787,16 @@ static void mysql_read (void)
 			else if (strcmp (key, "Qcache_queries_in_cache") == 0)
 				qcache_queries_in_cache = (int) val;
 		}
-		else if (strncmp (key, "Bytes_", 6) == 0)
+		else if (strncmp (key, "Bytes_", 
+				        strlen ("Bytes_")) == 0)
 		{
 			if (strcmp (key, "Bytes_received") == 0)
 				traffic_incoming += val;
 			else if (strcmp (key, "Bytes_sent") == 0)
 				traffic_outgoing += val;
 		}
-		else if (strncmp (key, "Threads_", 8) == 0)
+		else if (strncmp (key, "Threads_", 
+       				        strlen ("Threads_")) == 0)
 		{
 			if (strcmp (key, "Threads_running") == 0)
 				threads_running = (int) val;
@@ -441,6 +807,13 @@ static void mysql_read (void)
 			else if (strcmp (key, "Threads_created") == 0)
 				threads_created = val;
 		}
+		else if (strncmp (key, "Table_locks_",
+					strlen ("Table_locks_")) == 0)
+		{
+			counter_submit ("mysql_locks",
+					key + strlen ("Table_locks_"),
+					val, db);
+		}
 	}
 	mysql_free_result (res); res = NULL;
 
@@ -449,32 +822,24 @@ static void mysql_read (void)
 			|| (qcache_not_cached != 0ULL)
 			|| (qcache_lowmem_prunes != 0ULL))
 		qcache_submit (qcache_hits, qcache_inserts, qcache_not_cached,
-				qcache_lowmem_prunes, qcache_queries_in_cache);
+			       qcache_lowmem_prunes, qcache_queries_in_cache, db);
 
 	if (threads_created != 0ULL)
 		threads_submit (threads_running, threads_connected,
-				threads_cached, threads_created);
+				threads_cached, threads_created, db);
 
-	traffic_submit  (traffic_incoming, traffic_outgoing);
+	traffic_submit  (traffic_incoming, traffic_outgoing, db);
 
-	/* mysql_close (con); */
+	if (db->master_stats)
+		mysql_read_master_stats (db, con);
 
-	return;
-}
-#else
-# define mysql_read NULL
-#endif /* MYSQL_HAVE_READ */
+	if ((db->slave_stats) || (db->slave_notif))
+		mysql_read_slave_stats (db, con);
+
+	return (0);
+} /* int mysql_read */
 
 void module_register (void)
 {
-	plugin_register (MODULE_NAME, init, mysql_read, NULL);
-	plugin_register ("mysql_commands", NULL, NULL, commands_write);
-	plugin_register ("mysql_handler",  NULL, NULL, handler_write);
-	plugin_register ("mysql_qcache",   NULL, NULL, qcache_write);
-	plugin_register ("mysql_threads",  NULL, NULL, threads_write);
-	plugin_register ("mysql_traffic",  NULL, NULL, traffic_write);
-	cf_register (MODULE_NAME, config, config_keys, config_keys_num);
-}
-
-#undef BUFSIZE
-#undef MODULE_NAME
+	plugin_register_complex_config ("mysql", mysql_config);
+} /* void module_register */