X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=bf77a2fff3c9545b4e6fe036f673cea3da64d7ba;hb=cce136946b879557f91183e4de58e92b81e138c8;hp=f93a4421bebc695a1f41a85eab3b2daf91f27174;hpb=f2391b9da6127e4acd5b54b7ae6c2d585df0e2a0;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index f93a4421..bf77a2ff 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,6 +1,6 @@ /** * collectd - src/mysql.c - * Copyright (C) 2006-2009 Florian octo Forster + * Copyright (C) 2006-2010 Florian octo Forster * Copyright (C) 2008 Mirko Buffoni * Copyright (C) 2009 Doug MacEachern * Copyright (C) 2009 Sebastian tokkee Harl @@ -20,7 +20,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Mirko Buffoni * Doug MacEachern * Sebastian tokkee Harl @@ -38,25 +38,25 @@ #include #endif -/* TODO: Understand `Select_*' and possibly do that stuff as well.. */ - struct mysql_database_s /* {{{ */ { - /* instance == NULL => legacy mode */ char *instance; + char *alias; char *host; char *user; char *pass; char *database; char *socket; int port; + int timeout; - int master_stats; - int slave_stats; + _Bool master_stats; + _Bool slave_stats; + _Bool innodb_stats; - int slave_notif; - int slave_io_running; - int slave_sql_running; + _Bool slave_notif; + _Bool slave_io_running; + _Bool slave_sql_running; MYSQL *con; _Bool is_connected; @@ -65,6 +65,9 @@ typedef struct mysql_database_s mysql_database_t; /* }}} */ static int mysql_read (user_data_t *ud); +void mysql_read_default_options(struct st_mysql_options *options, + const char *filename,const char *group); + static void mysql_database_free (void *arg) /* {{{ */ { mysql_database_t *db; @@ -79,6 +82,7 @@ static void mysql_database_free (void *arg) /* {{{ */ if (db->con != NULL) mysql_close (db->con); + sfree (db->alias); sfree (db->host); sfree (db->user); sfree (db->pass); @@ -98,88 +102,9 @@ static void mysql_database_free (void *arg) /* {{{ */ * * */ - -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_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) - { - 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) /* {{{ */ +static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ { mysql_database_t *db; - int plugin_block; int status = 0; int i; @@ -200,76 +125,63 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ memset (db, 0, sizeof (*db)); /* initialize all the pointers */ + db->alias = NULL; db->host = NULL; db->user = NULL; db->pass = NULL; db->database = NULL; db->socket = NULL; db->con = NULL; + db->timeout = 0; /* 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 + 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++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Host", child->key) == 0) - status = mysql_config_set_string (&db->host, child); + if (strcasecmp ("Alias", child->key) == 0) + status = cf_util_get_string (child, &db->alias); + else if (strcasecmp ("Host", child->key) == 0) + 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 ("ConnectTimeout", child->key) == 0) + status = cf_util_get_int (child, &db->timeout); else if (strcasecmp ("MasterStats", child->key) == 0) - status = mysql_config_set_boolean (&db->master_stats, child); + status = cf_util_get_boolean (child, &db->master_stats); else if (strcasecmp ("SlaveStats", child->key) == 0) - status = mysql_config_set_boolean (&db->slave_stats, child); + status = cf_util_get_boolean (child, &db->slave_stats); else if (strcasecmp ("SlaveNotifications", child->key) == 0) - status = mysql_config_set_boolean (&db->slave_notif, child); + status = cf_util_get_boolean (child, &db->slave_notif); + else if (strcasecmp ("InnodbStats", child->key) == 0) + status = cf_util_get_boolean (child, &db->innodb_stats); else { WARNING ("mysql plugin: Option `%s' not allowed here.", child->key); @@ -280,49 +192,6 @@ 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) - { - 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 - : "", - db->port); - status = -1; - } - break; - } /* while (status == 0) */ - /* If all went well, register this database for reading */ if (status == 0) { @@ -336,15 +205,15 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ ud.data = (void *) db; ud.free_func = mysql_database_free; - if (db->database != NULL) + if (db->instance != NULL) ssnprintf (cb_name, sizeof (cb_name), "mysql-%s", - db->database); + db->instance); else sstrncpy (cb_name, "mysql", sizeof (cb_name)); plugin_register_complex_read (/* group = */ NULL, cb_name, mysql_read, - /* interval = */ NULL, &ud); + /* interval = */ 0, &ud); } else { @@ -353,6 +222,28 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ } 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 */ @@ -368,10 +259,7 @@ static MYSQL *getconnection (mysql_database_t *db) return (db->con); WARNING ("mysql plugin: Lost connection to instance \"%s\": %s", - (db->instance != NULL) - ? db->instance - : "", - mysql_error (db->con)); + db->instance, mysql_error (db->con)); } db->is_connected = 0; @@ -386,6 +274,9 @@ static MYSQL *getconnection (mysql_database_t *db) } } + /* Configure TCP connect timeout (default: 0) */ + db->con->options.connect_timeout = db->timeout; + if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) { @@ -410,29 +301,16 @@ static MYSQL *getconnection (mysql_database_t *db) static void set_host (mysql_database_t *db, char *buf, size_t buflen) { - /* XXX legacy mode - use hostname_g */ - if (db->instance == NULL) + if (db->alias) + sstrncpy (buf, db->alias, buflen); + else if ((db->host == NULL) + || (strcmp ("", db->host) == 0) + || (strcmp ("127.0.0.1", db->host) == 0) + || (strcmp ("localhost", db->host) == 0)) sstrncpy (buf, hostname_g, buflen); else - { - 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 - sstrncpy (buf, db->instance, buflen); -} + sstrncpy (buf, db->host, buflen); +} /* void set_host */ static void submit (const char *type, const char *type_instance, value_t *values, size_t values_len, mysql_database_t *db) @@ -445,7 +323,10 @@ static void submit (const char *type, const char *type_instance, set_host (db, vl.host, sizeof (vl.host)); sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - set_plugin_instance (db, vl.plugin_instance, sizeof (vl.plugin_instance)); + + /* 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)); if (type_instance != NULL) @@ -455,11 +336,11 @@ static void submit (const char *type, const char *type_instance, } /* submit */ static void counter_submit (const char *type, const char *type_instance, - counter_t value, mysql_database_t *db) + derive_t value, mysql_database_t *db) { value_t values[1]; - values[0].counter = value; + values[0].derive = value; submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); } /* void counter_submit */ @@ -472,40 +353,21 @@ static void gauge_submit (const char *type, const char *type_instance, 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, mysql_database_t *db) +static void derive_submit (const char *type, const char *type_instance, + derive_t value, mysql_database_t *db) { - 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 */ - -static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached, - counter_t created, mysql_database_t *db) -{ - value_t values[4]; - - values[0].gauge = running; - values[1].gauge = connected; - values[2].gauge = cached; - values[3].counter = created; + value_t values[1]; - submit ("mysql_threads", NULL, values, STATIC_ARRAY_SIZE (values), db); -} /* 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) +static void traffic_submit (derive_t rx, derive_t tx, mysql_database_t *db) { value_t values[2]; - values[0].counter = rx; - values[1].counter = tx; + values[0].derive = rx; + values[1].derive = tx; submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void traffic_submit */ @@ -642,7 +504,7 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) if (db->slave_notif) { - notification_t n = { 0, time (NULL), "", "", + notification_t n = { 0, cdtime (), "", "", "mysql", "", "time_offset", "", NULL }; char *io, *sql; @@ -651,8 +513,10 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) 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)); + + /* 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)) @@ -703,6 +567,130 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) return (0); } /* mysql_read_slave_stats */ +static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con) +{ + MYSQL_RES *res; + MYSQL_ROW row; + + char *query; + struct { + char *key; + char *type; + int ds_type; + } metrics[] = { + { "metadata_mem_pool_size", "bytes", DS_TYPE_GAUGE }, + { "lock_deadlocks", "mysql_locks", DS_TYPE_DERIVE }, + { "lock_timeouts", "mysql_locks", DS_TYPE_DERIVE }, + { "lock_row_lock_current_waits", "mysql_locks", DS_TYPE_DERIVE }, + { "buffer_pool_size", "bytes", DS_TYPE_GAUGE }, + + { "buffer_pool_reads", "operations", DS_TYPE_DERIVE }, + { "buffer_pool_read_requests", "operations", DS_TYPE_DERIVE }, + { "buffer_pool_write_requests", "operations", DS_TYPE_DERIVE }, + { "buffer_pool_wait_free", "operations", DS_TYPE_DERIVE }, + { "buffer_pool_read_ahead", "operations", DS_TYPE_DERIVE }, + { "buffer_pool_read_ahead_evicted", "operations", DS_TYPE_DERIVE }, + + { "buffer_pool_pages_total", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_pages_misc", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_pages_data", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_bytes_data", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_pages_dirty", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_bytes_dirty", "gauge", DS_TYPE_GAUGE }, + { "buffer_pool_pages_free", "gauge", DS_TYPE_GAUGE }, + + { "buffer_pages_created", "operations", DS_TYPE_DERIVE }, + { "buffer_pages_written", "operations", DS_TYPE_DERIVE }, + { "buffer_pages_read", "operations", DS_TYPE_DERIVE }, + { "buffer_data_reads", "operations", DS_TYPE_DERIVE }, + { "buffer_data_written", "operations", DS_TYPE_DERIVE }, + + { "os_data_reads", "operations", DS_TYPE_DERIVE }, + { "os_data_writes", "operations", DS_TYPE_DERIVE }, + { "os_data_fsyncs", "operations", DS_TYPE_DERIVE }, + { "os_log_bytes_written", "operations", DS_TYPE_DERIVE }, + { "os_log_fsyncs", "operations", DS_TYPE_DERIVE }, + { "os_log_pending_fsyncs", "operations", DS_TYPE_DERIVE }, + { "os_log_pending_writes", "operations", DS_TYPE_DERIVE }, + + { "trx_rseg_history_len", "gauge", DS_TYPE_GAUGE }, + + { "log_waits", "operations", DS_TYPE_DERIVE }, + { "log_write_requests", "operations", DS_TYPE_DERIVE }, + { "log_writes", "operations", DS_TYPE_DERIVE }, + { "adaptive_hash_searches", "operations", DS_TYPE_DERIVE }, + + { "file_num_open_files", "gauge", DS_TYPE_GAUGE }, + + { "ibuf_merges_insert", "operations", DS_TYPE_DERIVE }, + { "ibuf_merges_delete_mark", "operations", DS_TYPE_DERIVE }, + { "ibuf_merges_delete", "operations", DS_TYPE_DERIVE }, + { "ibuf_merges_discard_insert", "operations", DS_TYPE_DERIVE }, + { "ibuf_merges_discard_delete_mark","operations", DS_TYPE_DERIVE }, + { "ibuf_merges_discard_delete", "operations", DS_TYPE_DERIVE }, + { "ibuf_merges_discard_merges", "operations", DS_TYPE_DERIVE }, + { "ibuf_size", "bytes", DS_TYPE_GAUGE }, + + { "innodb_activity_count", "gauge", DS_TYPE_GAUGE }, + { "innodb_dblwr_writes", "operations", DS_TYPE_DERIVE }, + { "innodb_dblwr_pages_written", "operations", DS_TYPE_DERIVE }, + { "innodb_dblwr_page_size", "gauge", DS_TYPE_GAUGE }, + + { "innodb_rwlock_s_spin_waits", "operations", DS_TYPE_DERIVE }, + { "innodb_rwlock_x_spin_waits", "operations", DS_TYPE_DERIVE }, + { "innodb_rwlock_s_spin_rounds", "operations", DS_TYPE_DERIVE }, + { "innodb_rwlock_x_spin_rounds", "operations", DS_TYPE_DERIVE }, + { "innodb_rwlock_s_os_waits", "operations", DS_TYPE_DERIVE }, + { "innodb_rwlock_x_os_waits", "operations", DS_TYPE_DERIVE }, + + { "dml_reads", "operations", DS_TYPE_DERIVE }, + { "dml_inserts", "operations", DS_TYPE_DERIVE }, + { "dml_deletes", "operations", DS_TYPE_DERIVE }, + { "dml_updates", "operations", DS_TYPE_DERIVE }, + + { NULL, NULL, 0} + }; + + query = "SELECT name, count, type FROM information_schema.innodb_metrics WHERE status = 'enabled'"; + + res = exec_query (con, query); + if (res == NULL) + return (-1); + + while ((row = mysql_fetch_row (res))) + { + int i; + char *key; + unsigned long long val; + + key = row[0]; + val = atoll (row[1]); + + for (i = 0; + metrics[i].key != NULL && strcmp(metrics[i].key, key) != 0; + i++) + ; + + if (metrics[i].key == NULL) + continue; + + switch (metrics[i].ds_type) { + case DS_TYPE_COUNTER: + counter_submit(metrics[i].type, key, (counter_t)val, db); + break; + case DS_TYPE_GAUGE: + gauge_submit(metrics[i].type, key, (gauge_t)val, db); + break; + case DS_TYPE_DERIVE: + derive_submit(metrics[i].type, key, (derive_t)val, db); + break; + } + } + + mysql_free_result(res); + return (0); +} + static int mysql_read (user_data_t *ud) { mysql_database_t *db; @@ -711,19 +699,20 @@ static int mysql_read (user_data_t *ud) MYSQL_ROW row; char *query; - 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; + unsigned long mysql_version = 0ULL; if ((ud == NULL) || (ud->data == NULL)) { @@ -737,8 +726,10 @@ static int mysql_read (user_data_t *ud) if ((con = getconnection (db)) == NULL) return (-1); + mysql_version = mysql_get_server_version(con); + query = "SHOW STATUS"; - if (mysql_get_server_version (con) >= 50002) + if (mysql_version >= 50002) query = "SHOW GLOBAL STATUS"; res = exec_query (con, query); @@ -779,15 +770,15 @@ static int mysql_read (user_data_t *ud) 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_", strlen ("Bytes_")) == 0) @@ -801,13 +792,13 @@ static int mysql_read (user_data_t *ud) 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) @@ -816,22 +807,141 @@ static int mysql_read (user_data_t *ud) key + strlen ("Table_locks_"), val, db); } + else if (db->innodb_stats && strncmp (key, "Innodb_", strlen ("Innodb_")) == 0) + { + /* buffer pool */ + if (strcmp (key, "Innodb_buffer_pool_pages_data") == 0) + gauge_submit ("mysql_bpool_pages", "data", val, db); + else if (strcmp (key, "Innodb_buffer_pool_pages_dirty") == 0) + gauge_submit ("mysql_bpool_pages", "dirty", val, db); + else if (strcmp (key, "Innodb_buffer_pool_pages_flushed") == 0) + counter_submit ("mysql_bpool_pages", "flushed", val, db); + else if (strcmp (key, "Innodb_buffer_pool_pages_free") == 0) + gauge_submit ("mysql_bpool_pages", "free", val, db); + else if (strcmp (key, "Innodb_buffer_pool_pages_misc") == 0) + gauge_submit ("mysql_bpool_pages", "misc", val, db); + else if (strcmp (key, "Innodb_buffer_pool_pages_total") == 0) + gauge_submit ("mysql_bpool_pages", "total", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_ahead_rnd") == 0) + counter_submit ("mysql_bpool_counters", "read_ahead_rnd", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_ahead") == 0) + counter_submit ("mysql_bpool_counters", "read_ahead", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_ahead_evicted") == 0) + counter_submit ("mysql_bpool_counters", "read_ahead_evicted", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_requests") == 0) + counter_submit ("mysql_bpool_counters", "read_requests", val, db); + else if (strcmp (key, "Innodb_buffer_pool_reads") == 0) + counter_submit ("mysql_bpool_counters", "reads", val, db); + else if (strcmp (key, "Innodb_buffer_pool_write_requests") == 0) + counter_submit ("mysql_bpool_counters", "write_requests", val, db); + else if (strcmp (key, "Innodb_buffer_pool_bytes_data") == 0) + gauge_submit ("mysql_bpool_bytes", "data", val, db); + else if (strcmp (key, "Innodb_buffer_pool_bytes_dirty") == 0) + gauge_submit ("mysql_bpool_bytes", "dirty", val, db); + + /* data */ + if (strcmp (key, "Innodb_data_fsyncs") == 0) + counter_submit ("mysql_innodb_data", "fsyncs", val, db); + else if (strcmp (key, "Innodb_data_read") == 0) + counter_submit ("mysql_innodb_data", "read", val, db); + else if (strcmp (key, "Innodb_data_reads") == 0) + counter_submit ("mysql_innodb_data", "reads", val, db); + else if (strcmp (key, "Innodb_data_writes") == 0) + counter_submit ("mysql_innodb_data", "writes", val, db); + else if (strcmp (key, "Innodb_data_written") == 0) + counter_submit ("mysql_innodb_data", "written", val, db); + + /* double write */ + else if (strcmp (key, "Innodb_dblwr_writes") == 0) + counter_submit ("mysql_innodb_dblwr", "writes", val, db); + else if (strcmp (key, "Innodb_dblwr_pages_written") == 0) + counter_submit ("mysql_innodb_dblwr", "written", val, db); + + /* log */ + else if (strcmp (key, "Innodb_log_waits") == 0) + counter_submit ("mysql_innodb_log", "waits", val, db); + else if (strcmp (key, "Innodb_log_write_requests") == 0) + counter_submit ("mysql_innodb_log", "write_requests", val, db); + else if (strcmp (key, "Innodb_log_writes") == 0) + counter_submit ("mysql_innodb_log", "writes", val, db); + else if (strcmp (key, "Innodb_os_log_fsyncs") == 0) + counter_submit ("mysql_innodb_log", "fsyncs", val, db); + else if (strcmp (key, "Innodb_os_log_written") == 0) + counter_submit ("mysql_innodb_log", "written", val, db); + + /* pages */ + else if (strcmp (key, "Innodb_pages_created") == 0) + counter_submit ("mysql_innodb_pages", "created", val, db); + else if (strcmp (key, "Innodb_pages_read") == 0) + counter_submit ("mysql_innodb_pages", "read", val, db); + else if (strcmp (key, "Innodb_pages_written") == 0) + counter_submit ("mysql_innodb_pages", "written", val, db); + + /* row lock */ + else if (strcmp (key, "Innodb_row_lock_time") == 0) + counter_submit ("mysql_innodb_row_lock", "time", val, db); + else if (strcmp (key, "Innodb_row_lock_waits") == 0) + counter_submit ("mysql_innodb_row_lock", "waits", val, db); + + /* rows */ + else if (strcmp (key, "Innodb_rows_deleted") == 0) + counter_submit ("mysql_innodb_rows", "deleted", val, db); + else if (strcmp (key, "Innodb_rows_inserted") == 0) + counter_submit ("mysql_innodb_rows", "inserted", val, db); + else if (strcmp (key, "Innodb_rows_read") == 0) + counter_submit ("mysql_innodb_rows", "read", val, db); + else if (strcmp (key, "Innodb_rows_updated") == 0) + counter_submit ("mysql_innodb_rows", "updated", val, db); + } + else if (strncmp (key, "Select_", strlen ("Select_")) == 0) + { + counter_submit ("mysql_select", key + strlen ("Select_"), + val, db); + } + else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0) + { + counter_submit ("mysql_sort", key + strlen ("Sort_"), + 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 ((qcache_hits != 0) + || (qcache_inserts != 0) + || (qcache_not_cached != 0) + || (qcache_lowmem_prunes != 0)) + { + 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 (threads_created != 0ULL) - threads_submit (threads_running, threads_connected, - threads_cached, threads_created, db); + if (threads_created != 0) + { + 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 (mysql_version >= 50600 && db->innodb_stats) + mysql_read_innodb_stats (db, con); + if (db->master_stats) mysql_read_master_stats (db, con);