X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fmysql.c;h=bfdbb76667aebc80d4a11f8a0714294b09cbdc94;hp=cd1ff9d39452fd788a610b1736ac749b51cc4276;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hpb=218635ab44a8533ef5b23fd1ae78be761ff0600c diff --git a/src/mysql.c b/src/mysql.c index cd1ff9d3..bfdbb766 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,7 +1,10 @@ /** * collectd - src/mysql.c - * Copyright (C) 2006–2008 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 @@ -19,6 +22,9 @@ * Authors: * Florian octo Forster * Mirko Buffoni + * Doug MacEachern + * Sebastian tokkee Harl + * Rodolphe Quiédeville **/ #include "collectd.h" @@ -34,146 +40,444 @@ /* TODO: Understand `Select_*' and possibly do that stuff as well.. */ -static const char *config_keys[] = +struct mysql_database_s /* {{{ */ { - "Host", - "User", - "Password", - "Database", - "Port", - "Socket", - NULL + /* 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; }; -static int config_keys_num = 6; +typedef struct mysql_database_s mysql_database_t; /* }}} */ -static char *host = "localhost"; -static char *user; -static char *pass; -static char *db = NULL; -static char *socket = NULL; -static int port = 0; +static int mysql_read (user_data_t *ud); -static MYSQL *getconnection (void) +static void mysql_database_free (void *arg) /* {{{ */ { - static MYSQL *con; - static int state; + mysql_database_t *db; - static int wait_for = 0; - static int wait_increase = 60; + DEBUG ("mysql plugin: mysql_database_free (arg = %p);", arg); - if (state != 0) + db = (mysql_database_t *) arg; + + if (db == NULL) + return; + + if (db->con != NULL) + mysql_close (db->con); + + sfree (db->host); + sfree (db->user); + sfree (db->pass); + sfree (db->socket); + sfree (db->instance); + sfree (db->database); + sfree (db); +} /* }}} void mysql_database_free */ + +/* Configuration handling functions {{{ + * + * + * + * Host "localhost" + * Port 22000 + * ... + * + * + */ + +static int mysql_config_set_string (char **ret_string, /* {{{ */ + oconfig_item_t *ci) +{ + char *string; + + if ((ci->values_num != 1) + || (ci->values[0].type != OCONFIG_TYPE_STRING)) { - int err; - if ((err = mysql_ping (con)) != 0) + 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) +{ + 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; + + return (0); +} /* }}} int mysql_config_set_int */ + +static int mysql_config_set_boolean (int *ret_boolean, /* {{{ */ + oconfig_item_t *ci) +{ + 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) { - WARNING ("mysql_ping failed: %s", mysql_error (con)); - state = 0; + 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 (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) /* {{{ */ +{ + mysql_database_t *db; + int plugin_block; + int status = 0; + int i; + + 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) { - state = 1; - return (con); + sfree (db); + return (status); } + assert (db->instance != NULL); + } + else + { + ERROR ("mysql plugin: mysql_config: " + "Invalid key: %s", ci->key); + return (-1); } - if (wait_for > 0) + /* Fill the `mysql_database_t' structure.. */ + for (i = 0; i < ci->children_num; i++) { - wait_for -= interval_g; - return (NULL); + 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; } - wait_for = wait_increase; - wait_increase *= 2; - if (wait_increase > 86400) - wait_increase = 86400; + /* 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 " + "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!"); + } - if ((con = mysql_init (con)) == NULL) + /* Check that all necessary options have been given. */ + while (status == 0) { - ERROR ("mysql_init failed: %s", mysql_error (con)); - state = 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 + : "", + 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 : ""); + + 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 (db->con)) != 0) + { + WARNING ("mysql_ping failed for %s: %s", + (db->instance != NULL) + ? db->instance + : "", + mysql_error (db->con)); + db->state = 0; + } + else + { + db->state = 1; + return (db->con); + } + } + + if ((db->con = mysql_init (db->con)) == NULL) + { + ERROR ("mysql_init failed: %s", mysql_error (db->con)); + db->state = 0; return (NULL); } - if (mysql_real_connect (con, host, user, pass, db, port, socket, 0) == NULL) + if (mysql_real_connect (db->con, db->host, db->user, db->pass, + db->database, db->port, db->socket, 0) == NULL) { - ERROR ("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 : "", + (db->host != NULL) ? db->host : "localhost", + mysql_error (db->con)); + db->state = 0; return (NULL); } else { - state = 1; - wait_for = 0; - wait_increase = 60; - return (con); + INFO ("mysql plugin: Successfully connected to database %s " + "at server %s (server version: %s, protocol version: %d)", + (db->database != NULL) ? db->database : "", + 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) */ +} /* static MYSQL *getconnection (mysql_database_t *db) */ -static int config (const char *key, const char *value) +static void set_host (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); - else if (strcasecmp (key, "socket") == 0) - return ((socket = strdup (value)) == NULL ? 1 : 0); - else if (strcasecmp (key, "port") == 0) + /* XXX legacy mode - use hostname_g */ + if (db->instance == NULL) + sstrncpy (buf, hostname_g, buflen); + else { - char *endptr = NULL; - int temp; - - errno = 0; - temp = strtol (value, &endptr, 0); - if ((errno != 0) || (value == endptr)) - { - ERROR ("mysql plugin: Invalid \"Port\" argument: %s", - value); - port = 0; - return (1); - } - else if ((temp < 0) || (temp >= 65535)) - { - ERROR ("mysql plugin: Port number out of range: %i", - temp); - port = 0; - return (1); - } - - port = temp; - return (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); } +} + +static void set_plugin_instance (mysql_database_t *db, + char *buf, size_t buflen) +{ + /* XXX legacy mode - no plugin_instance */ + if (db->instance == NULL) + sstrncpy (buf, "", buflen); else - return (-1); -} /* int config */ + sstrncpy (buf, db->instance, buflen); +} -static void counter_submit (const char *type, const char *type_instance, - counter_t value) +static void submit (const char *type, const char *type_instance, + value_t *values, size_t values_len, mysql_database_t *db) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = value; + vl.values = values; + vl.values_len = values_len; + + set_host (db, vl.host, sizeof (vl.host)); - vl.values = values; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + set_plugin_instance (db, vl.plugin_instance, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + if (type_instance != NULL) + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); +} /* submit */ + +static void counter_submit (const char *type, const char *type_instance, + counter_t value, mysql_database_t *db) +{ + value_t values[1]; + + values[0].counter = value; + submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); } /* void counter_submit */ +static void gauge_submit (const char *type, const char *type_instance, + gauge_t value, mysql_database_t *db) +{ + value_t values[1]; + + values[0].gauge = value; + submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); +} /* void gauge_submit */ + static void qcache_submit (counter_t hits, counter_t inserts, counter_t not_cached, counter_t lowmem_prunes, - gauge_t queries_in_cache) + gauge_t queries_in_cache, mysql_database_t *db) { value_t values[5]; - value_list_t vl = VALUE_LIST_INIT; values[0].counter = hits; values[1].counter = inserts; @@ -181,60 +485,228 @@ static void qcache_submit (counter_t hits, counter_t inserts, values[3].counter = lowmem_prunes; values[4].gauge = queries_in_cache; - vl.values = values; - vl.values_len = 5; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type)); - - plugin_dispatch_values (&vl); + submit ("mysql_qcache", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void qcache_submit */ static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached, - counter_t created) + counter_t created, mysql_database_t *db) { value_t values[4]; - value_list_t vl = VALUE_LIST_INIT; values[0].gauge = running; values[1].gauge = connected; values[2].gauge = cached; values[3].counter = created; - vl.values = values; - vl.values_len = 4; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_threads", sizeof (vl.type)); - - plugin_dispatch_values (&vl); + submit ("mysql_threads", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void threads_submit */ -static void traffic_submit (counter_t rx, counter_t tx) +static void traffic_submit (counter_t rx, counter_t tx, mysql_database_t *db) { value_t values[2]; - value_list_t vl = VALUE_LIST_INIT; values[0].counter = rx; values[1].counter = tx; - vl.values = values; - vl.values_len = 2; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_octets", sizeof (vl.type)); - - plugin_dispatch_values (&vl); + submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void traffic_submit */ -static int mysql_read (void) +static MYSQL_RES *exec_query (MYSQL *con, const char *query) +{ + MYSQL_RES *res; + + int query_len = strlen (query); + + if (mysql_real_query (con, query, query_len)) + { + ERROR ("mysql plugin: Failed to execute query: %s", + mysql_error (con)); + INFO ("mysql plugin: SQL query was: %s", query); + return (NULL); + } + + res = mysql_store_result (con); + if (res == NULL) + { + ERROR ("mysql plugin: Failed to store query result: %s", + mysql_error (con)); + INFO ("mysql plugin: SQL query was: %s", query); + return (NULL); + } + + return (res); +} /* exec_query */ + +static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con) +{ + MYSQL_RES *res; + MYSQL_ROW row; + + char *query; + int field_num; + unsigned long long position; + + query = "SHOW MASTER STATUS"; + + res = exec_query (con, query); + if (res == NULL) + return (-1); + + row = mysql_fetch_row (res); + if (row == NULL) + { + ERROR ("mysql plugin: Failed to get master statistics: " + "`%s' did not return any rows.", query); + return (-1); + } + + field_num = mysql_num_fields (res); + if (field_num < 2) + { + ERROR ("mysql plugin: Failed to get master statistics: " + "`%s' returned less than two columns.", query); + return (-1); + } + + 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); + + mysql_free_result (res); + + return (0); +} /* mysql_read_master_stats */ + +static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) { + MYSQL_RES *res; + MYSQL_ROW row; + + char *query; + int field_num; + + /* 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) + { + ERROR ("mysql plugin: Failed to get slave statistics: " + "`%s' did not return any rows.", query); + return (-1); + } + + field_num = mysql_num_fields (res); + if (field_num < 33) + { + ERROR ("mysql plugin: Failed to get slave statistics: " + "`%s' returned less than 33 columns.", query); + return (-1); + } + + if (db->slave_stats) + { + unsigned long long counter; + double gauge; + + counter = atoll (row[READ_MASTER_LOG_POS_IDX]); + counter_submit ("mysql_log_position", "slave-read", counter, db); + + counter = atoll (row[EXEC_MASTER_LOG_POS_IDX]); + counter_submit ("mysql_log_position", "slave-exec", counter, db); + + if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) + { + gauge = atof (row[SECONDS_BEHIND_MASTER_IDX]); + gauge_submit ("time_offset", NULL, gauge, db); + } + } + + if (db->slave_notif) + { + 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; + } + } + + 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 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; @@ -250,31 +722,27 @@ static int mysql_read (void) unsigned long long traffic_incoming = 0ULL; unsigned long long traffic_outgoing = 0ULL; + 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) + 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)) - { - ERROR ("mysql_real_query failed: %s\n", - mysql_error (con)); - return (-1); - } - - if ((res = mysql_store_result (con)) == NULL) - { - ERROR ("mysql_store_result failed: %s\n", - mysql_error (con)); + 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; @@ -283,23 +751,30 @@ static int 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) - counter_submit ("mysql_commands", 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; - counter_submit ("mysql_handler", 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; @@ -312,14 +787,16 @@ static int 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; @@ -330,6 +807,13 @@ static int 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; @@ -338,21 +822,24 @@ static int 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, db); - traffic_submit (traffic_incoming, traffic_outgoing); + if (db->master_stats) + mysql_read_master_stats (db, con); - /* mysql_close (con); */ + if ((db->slave_stats) || (db->slave_notif)) + mysql_read_slave_stats (db, con); return (0); } /* int mysql_read */ void module_register (void) { - plugin_register_config ("mysql", config, config_keys, config_keys_num); - plugin_register_read ("mysql", mysql_read); + plugin_register_complex_config ("mysql", mysql_config); } /* void module_register */