X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=1ca3b484ce6d2ebadc490196ed64260140c7d18c;hb=f1b5b8611d87a7904c31ae4b28ea47f11f3c38b9;hp=734b910dea76b5b79f153217f10bd98ee572e076;hpb=439034ae2ec4fa28e6f2d0b5c1f0f18c80762e90;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 734b910d..1ca3b484 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,6 +1,10 @@ /** * collectd - src/mysql.c - * Copyright (C) 2006,2007 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 @@ -17,6 +21,10 @@ * * Authors: * Florian octo Forster + * Mirko Buffoni + * Doug MacEachern + * Sebastian tokkee Harl + * Rodolphe Quiédeville **/ #include "collectd.h" @@ -34,7 +42,6 @@ struct mysql_database_s /* {{{ */ { - /* instance == NULL => legacy mode */ char *instance; char *host; char *user; @@ -43,19 +50,28 @@ struct mysql_database_s /* {{{ */ char *socket; int port; + _Bool master_stats; + _Bool slave_stats; + + _Bool slave_notif; + _Bool slave_io_running; + _Bool slave_sql_running; + MYSQL *con; int state; - - int wait_for; - int wait_increase; }; typedef struct mysql_database_s mysql_database_t; /* }}} */ -static mysql_database_t **databases = NULL; -static size_t databases_num = 0; +static int mysql_read (user_data_t *ud); -static void mysql_database_free (mysql_database_t *db) /* {{{ */ +static void mysql_database_free (void *arg) /* {{{ */ { + mysql_database_t *db; + + DEBUG ("mysql plugin: mysql_database_free (arg = %p);", arg); + + db = (mysql_database_t *) arg; + if (db == NULL) return; @@ -66,6 +82,8 @@ static void mysql_database_free (mysql_database_t *db) /* {{{ */ sfree (db->user); sfree (db->pass); sfree (db->socket); + sfree (db->instance); + sfree (db->database); sfree (db); } /* }}} void mysql_database_free */ @@ -79,55 +97,10 @@ static void mysql_database_free (mysql_database_t *db) /* {{{ */ * * */ - -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)) - { - 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 (oconfig_item_t *ci) /* {{{ */ +static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ { mysql_database_t *db; - int plugin_block; - int status; + int status = 0; int i; if ((ci->values_num != 1) @@ -153,31 +126,18 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ db->database = NULL; db->socket = NULL; db->con = NULL; - /* initialize non-configurable defaults */ - db->wait_increase = 60; - 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 + /* trigger a notification, if it's not running */ + db->slave_io_running = 1; + db->slave_sql_running = 1; + + status = cf_util_get_string (ci, &db->instance); + if (status != 0) { - ERROR ("mysql plugin: mysql_config: " - "Invalid key: %s", ci->key); - return (-1); + sfree (db); + return (status); } + assert (db->instance != NULL); /* Fill the `mysql_database_t' structure.. */ for (i = 0; i < ci->children_num; i++) @@ -185,30 +145,30 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("Host", child->key) == 0) - status = mysql_config_set_string (&db->host, child); + status = cf_util_get_string (child, &db->host); else if (strcasecmp ("User", child->key) == 0) - status = mysql_config_set_string (&db->user, child); + status = cf_util_get_string (child, &db->user); else if (strcasecmp ("Password", child->key) == 0) - status = mysql_config_set_string (&db->pass, child); + status = cf_util_get_string (child, &db->pass); 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); + status = cf_util_get_port_number (child); + if (status > 0) + { + db->port = status; + status = 0; + } } - /* 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 ("Socket", child->key) == 0) + status = cf_util_get_string (child, &db->socket); + else if (strcasecmp ("Database", child->key) == 0) + status = cf_util_get_string (child, &db->database); + else if (strcasecmp ("MasterStats", child->key) == 0) + status = cf_util_get_boolean (child, &db->master_stats); + else if (strcasecmp ("SlaveStats", child->key) == 0) + status = cf_util_get_boolean (child, &db->slave_stats); + else if (strcasecmp ("SlaveNotifications", child->key) == 0) + status = cf_util_get_boolean (child, &db->slave_notif); else { WARNING ("mysql plugin: Option `%s' not allowed here.", child->key); @@ -219,76 +179,58 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ 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 " - "block has been found. The legacy " - "configuration will be ignored."); - } - mysql_database_free (db); - return (0); - } - else if (plugin_block != 0) + /* If all went well, register this database for reading */ + if (status == 0) { - WARNING ("mysql plugin: You're using the legacy " - "configuration options. Please consider " - "updating your configuration!"); - } + user_data_t ud; + char cb_name[DATA_MAX_NAME_LEN]; - /* 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 - : "", - db->port); - status = -1; - } - break; - } /* while (status == 0) */ + DEBUG ("mysql plugin: Registering new read callback: %s", + (db->database != NULL) ? db->database : ""); - /* If all went well, add this database to the global list of databases. */ - if (status == 0) - { - mysql_database_t **temp; + memset (&ud, 0, sizeof (ud)); + ud.data = (void *) db; + ud.free_func = mysql_database_free; - temp = (mysql_database_t **) realloc (databases, - sizeof (*databases) * (databases_num + 1)); - if (temp == NULL) - { - ERROR ("mysql plugin: realloc failed"); - status = -1; - } + if (db->database != NULL) + ssnprintf (cb_name, sizeof (cb_name), "mysql-%s", + db->database); else - { - databases = temp; - databases[databases_num] = db; - databases_num++; - } - } + sstrncpy (cb_name, "mysql", sizeof (cb_name)); - if (status != 0) + 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_database */ + +static int mysql_config (oconfig_item_t *ci) /* {{{ */ +{ + int i; + + if (ci == NULL) + return (EINVAL); + + /* Fill the `mysql_database_t' structure.. */ + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + + if (strcasecmp ("Database", child->key) == 0) + mysql_config_database (child); + else + WARNING ("mysql plugin: Option \"%s\" not allowed here.", + child->key); + } + + return (0); } /* }}} int mysql_config */ /* }}} End of configuration handling functions */ @@ -300,7 +242,11 @@ static MYSQL *getconnection (mysql_database_t *db) int err; if ((err = mysql_ping (db->con)) != 0) { - WARNING ("mysql_ping failed: %s", mysql_error (db->con)); + /* Assured by "mysql_config_database" */ + assert (db->instance != NULL); + WARNING ("mysql_ping failed for instance \"%s\": %s", + db->instance, + mysql_error (db->con)); db->state = 0; } else @@ -310,17 +256,6 @@ static MYSQL *getconnection (mysql_database_t *db) } } - if (db->wait_for > 0) - { - db->wait_for -= interval_g; - return (NULL); - } - - db->wait_for = db->wait_increase; - db->wait_increase *= 2; - if (db->wait_increase > 86400) - db->wait_increase = 86400; - if ((db->con = mysql_init (db->con)) == NULL) { ERROR ("mysql_init failed: %s", mysql_error (db->con)); @@ -331,150 +266,319 @@ static MYSQL *getconnection (mysql_database_t *db) 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 (db->con)); + 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 { + 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; - db->wait_for = 0; - db->wait_increase = 60; return (db->con); } } /* static MYSQL *getconnection (mysql_database_t *db) */ -static void set_host (mysql_database_t *db, value_list_t *vl) -{ - /* XXX legacy mode - use hostname_g */ - if (db->instance == NULL) - sstrncpy (vl->host, hostname_g, sizeof (vl->host)); - else - { - if ((db->host == NULL) - || (strcmp ("", db->host) == 0) - || (strcmp ("localhost", db->host) == 0)) - sstrncpy (vl->host, hostname_g, sizeof (vl->host)); - else - sstrncpy (vl->host, db->host, sizeof (vl->host)); - } -} - -static void set_plugin_instance (mysql_database_t *db, value_list_t *vl) +static void set_host (mysql_database_t *db, char *buf, size_t buflen) { - /* XXX legacy mode - no plugin_instance */ - if (db->instance == NULL) - sstrncpy (vl->plugin_instance, "", - sizeof (vl->plugin_instance)); + if ((db->host == NULL) + || (strcmp ("", db->host) == 0) + || (strcmp ("localhost", db->host) == 0)) + sstrncpy (buf, hostname_g, buflen); else - sstrncpy (vl->plugin_instance, db->instance, - sizeof (vl->plugin_instance)); -} + sstrncpy (buf, db->host, buflen); +} /* void set_host */ -static void counter_submit (const char *type, const char *type_instance, - counter_t value, mysql_database_t *db) +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; - set_host (db, &vl); sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + + /* Assured by "mysql_config_database" */ + assert (db->instance != NULL); + sstrncpy (vl.plugin_instance, db->instance, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - set_plugin_instance (db, &vl); + if (type_instance != NULL) + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -} /* void counter_submit */ +} /* submit */ -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) +static void counter_submit (const char *type, const char *type_instance, + counter_t value, mysql_database_t *db) { - value_t values[5]; - value_list_t vl = VALUE_LIST_INIT; - - values[0].counter = hits; - values[1].counter = inserts; - values[2].counter = not_cached; - values[3].counter = lowmem_prunes; - values[4].gauge = queries_in_cache; - - vl.values = values; - vl.values_len = 5; - set_host (db, &vl); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type)); - set_plugin_instance (db, &vl); + value_t values[1]; - plugin_dispatch_values (&vl); -} /* void qcache_submit */ + values[0].counter = value; + submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); +} /* void counter_submit */ -static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached, - counter_t created, mysql_database_t *db) +static void gauge_submit (const char *type, const char *type_instance, + gauge_t value, mysql_database_t *db) { - value_t values[4]; - value_list_t vl = VALUE_LIST_INIT; + value_t values[1]; - values[0].gauge = running; - values[1].gauge = connected; - values[2].gauge = cached; - values[3].counter = created; + values[0].gauge = value; + submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); +} /* void gauge_submit */ - vl.values = values; - vl.values_len = 4; - set_host (db, &vl); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_threads", sizeof (vl.type)); - set_plugin_instance (db, &vl); +static void derive_submit (const char *type, const char *type_instance, + derive_t value, mysql_database_t *db) +{ + value_t values[1]; - plugin_dispatch_values (&vl); -} /* void threads_submit */ + values[0].derive = value; + submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); +} /* void derive_submit */ 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; - set_host (db, &vl); - sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - sstrncpy (vl.type, "mysql_octets", sizeof (vl.type)); - set_plugin_instance (db, &vl); - - plugin_dispatch_values (&vl); + submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void traffic_submit */ -static int mysql_read_database (mysql_database_t *db) +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, cdtime (), "", "", + "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)); + + /* Assured by "mysql_config_database" */ + assert (db->instance != NULL); + sstrncpy (n.plugin_instance, db->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; - unsigned long long qcache_not_cached = 0ULL; - unsigned long long qcache_lowmem_prunes = 0ULL; - int qcache_queries_in_cache = -1; + derive_t qcache_hits = 0; + derive_t qcache_inserts = 0; + derive_t qcache_not_cached = 0; + derive_t qcache_lowmem_prunes = 0; + gauge_t qcache_queries_in_cache = NAN; - int threads_running = -1; - int threads_connected = -1; - int threads_cached = -1; - unsigned long long threads_created = 0ULL; + gauge_t threads_running = NAN; + gauge_t threads_connected = NAN; + gauge_t threads_cached = NAN; + derive_t threads_created = 0; 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 (db)) == NULL) return (-1); @@ -483,21 +587,9 @@ static int mysql_read_database (mysql_database_t *db) 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)); + res = exec_query (con, query); + if (res == NULL) return (-1); - } - - if ((res = mysql_store_result (con)) == NULL) - { - ERROR ("mysql_store_result failed: %s\n", - mysql_error (con)); - return (-1); - } field_num = mysql_num_fields (res); while ((row = mysql_fetch_row (res))) @@ -508,97 +600,115 @@ static int mysql_read_database (mysql_database_t *db) 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, db); + 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, db); + 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; + qcache_hits = (derive_t) val; else if (strcmp (key, "Qcache_inserts") == 0) - qcache_inserts = val; + qcache_inserts = (derive_t) val; else if (strcmp (key, "Qcache_not_cached") == 0) - qcache_not_cached = val; + qcache_not_cached = (derive_t) val; else if (strcmp (key, "Qcache_lowmem_prunes") == 0) - qcache_lowmem_prunes = val; + qcache_lowmem_prunes = (derive_t) val; else if (strcmp (key, "Qcache_queries_in_cache") == 0) - qcache_queries_in_cache = (int) val; + qcache_queries_in_cache = (gauge_t) 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; + threads_running = (gauge_t) val; else if (strcmp (key, "Threads_connected") == 0) - threads_connected = (int) val; + threads_connected = (gauge_t) val; else if (strcmp (key, "Threads_cached") == 0) - threads_cached = (int) val; + threads_cached = (gauge_t) val; else if (strcmp (key, "Threads_created") == 0) - threads_created = val; + threads_created = (derive_t) 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; - if ((qcache_hits != 0ULL) - || (qcache_inserts != 0ULL) - || (qcache_not_cached != 0ULL) - || (qcache_lowmem_prunes != 0ULL)) - qcache_submit (qcache_hits, qcache_inserts, qcache_not_cached, - qcache_lowmem_prunes, qcache_queries_in_cache, db); - - if (threads_created != 0ULL) - threads_submit (threads_running, threads_connected, - threads_cached, threads_created, db); - - traffic_submit (traffic_incoming, traffic_outgoing, db); - - return (0); -} /* int mysql_read_database */ - -static int mysql_read (void) -{ - size_t i; - int success = 0; - int status; - - for (i = 0; i < databases_num; i++) + if ((qcache_hits != 0) + || (qcache_inserts != 0) + || (qcache_not_cached != 0) + || (qcache_lowmem_prunes != 0)) { - status = mysql_read_database (databases[i]); - if (status == 0) - success++; + derive_submit ("cache_result", "qcache-hits", + qcache_hits, db); + derive_submit ("cache_result", "qcache-inserts", + qcache_inserts, db); + derive_submit ("cache_result", "qcache-not_cached", + qcache_not_cached, db); + derive_submit ("cache_result", "qcache-prunes", + qcache_lowmem_prunes, db); + + gauge_submit ("cache_size", "qcache", + qcache_queries_in_cache, db); } - if (success == 0) + if (threads_created != 0) { - ERROR ("mysql plugin: No database could be read. Will return an error so " - "the plugin will be delayed."); - return (-1); + gauge_submit ("threads", "running", + threads_running, db); + gauge_submit ("threads", "connected", + threads_connected, db); + gauge_submit ("threads", "cached", + threads_cached, db); + + derive_submit ("total_threads", "created", + threads_created, db); } + traffic_submit (traffic_incoming, traffic_outgoing, db); + + if (db->master_stats) + mysql_read_master_stats (db, 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_complex_config ("mysql", mysql_config); - plugin_register_read ("mysql", mysql_read); } /* void module_register */