X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmysql.c;h=a64b0e5bc96a6125757abb17da6548a1b13473fe;hb=8acc85b19e44c9bc106484b95cd352d867abdf1c;hp=d15a055fe3296f70835e8e6daed68a46b37965bc;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index d15a055f..a64b0e5b 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -28,9 +28,9 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include "configfile.h" #ifdef HAVE_MYSQL_H #include @@ -38,20 +38,30 @@ #include #endif -/* TODO: Understand `Select_*' and possibly do that stuff as well.. */ - struct mysql_database_s /* {{{ */ { char *instance; + char *alias; char *host; char *user; char *pass; char *database; + + /* mysql_ssl_set params */ + char *key; + char *cert; + char *ca; + char *capath; + char *cipher; + char *socket; int port; + int timeout; _Bool master_stats; _Bool slave_stats; + _Bool innodb_stats; + _Bool wsrep_stats; _Bool slave_notif; _Bool slave_io_running; @@ -70,7 +80,7 @@ static void mysql_database_free (void *arg) /* {{{ */ DEBUG ("mysql plugin: mysql_database_free (arg = %p);", arg); - db = (mysql_database_t *) arg; + db = arg; if (db == NULL) return; @@ -78,12 +88,18 @@ 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); sfree (db->socket); sfree (db->instance); sfree (db->database); + sfree (db->key); + sfree (db->cert); + sfree (db->ca); + sfree (db->capath); + sfree (db->cipher); sfree (db); } /* }}} void mysql_database_free */ @@ -101,7 +117,6 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ { mysql_database_t *db; int status = 0; - int i; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) @@ -111,21 +126,28 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ return (-1); } - db = (mysql_database_t *) malloc (sizeof (*db)); + db = calloc (1, sizeof (*db)); if (db == NULL) { - ERROR ("mysql plugin: malloc failed."); + ERROR ("mysql plugin: calloc failed."); return (-1); } - 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->key = NULL; + db->cert = NULL; + db->ca = NULL; + db->capath = NULL; + db->cipher = NULL; + db->socket = NULL; db->con = NULL; + db->timeout = 0; /* trigger a notification, if it's not running */ db->slave_io_running = 1; @@ -140,11 +162,13 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ assert (db->instance != NULL); /* Fill the `mysql_database_t' structure.. */ - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Host", child->key) == 0) + 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 = cf_util_get_string (child, &db->user); @@ -163,12 +187,28 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ 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 ("SSLKey", child->key) == 0) + status = cf_util_get_string (child, &db->key); + else if (strcasecmp ("SSLCert", child->key) == 0) + status = cf_util_get_string (child, &db->cert); + else if (strcasecmp ("SSLCA", child->key) == 0) + status = cf_util_get_string (child, &db->ca); + else if (strcasecmp ("SSLCAPath", child->key) == 0) + status = cf_util_get_string (child, &db->capath); + else if (strcasecmp ("SSLCipher", child->key) == 0) + status = cf_util_get_string (child, &db->cipher); + else if (strcasecmp ("ConnectTimeout", child->key) == 0) + status = cf_util_get_int (child, &db->timeout); 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 if (strcasecmp ("InnodbStats", child->key) == 0) + status = cf_util_get_boolean (child, &db->innodb_stats); + else if (strcasecmp ("WsrepStats", child->key) == 0) + status = cf_util_get_boolean (child, &db->wsrep_stats); else { WARNING ("mysql plugin: Option `%s' not allowed here.", child->key); @@ -182,16 +222,11 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ /* 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->instance != NULL) ssnprintf (cb_name, sizeof (cb_name), "mysql-%s", db->instance); @@ -199,8 +234,10 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ sstrncpy (cb_name, "mysql", sizeof (cb_name)); plugin_register_complex_read (/* group = */ NULL, cb_name, - mysql_read, - /* interval = */ NULL, &ud); + mysql_read, /* interval = */ 0, &(user_data_t) { + .data = db, + .free_func = mysql_database_free, + }); } else { @@ -213,13 +250,11 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ 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++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -237,6 +272,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ static MYSQL *getconnection (mysql_database_t *db) { + const char *cipher; + if (db->is_connected) { int status; @@ -261,6 +298,11 @@ static MYSQL *getconnection (mysql_database_t *db) } } + /* Configure TCP connect timeout (default: 0) */ + db->con->options.connect_timeout = db->timeout; + + mysql_ssl_set (db->con, db->key, db->cert, db->ca, db->capath, db->cipher); + if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) { @@ -272,10 +314,14 @@ static MYSQL *getconnection (mysql_database_t *db) return (NULL); } + cipher = mysql_get_ssl_cipher (db->con); + INFO ("mysql plugin: Successfully connected to database %s " - "at server %s (server version: %s, protocol version: %d)", + "at server %s with cipher %s " + "(server version: %s, protocol version: %d) ", (db->database != NULL) ? db->database : "", mysql_get_host_info (db->con), + (cipher != NULL) ? cipher : "", mysql_get_server_info (db->con), mysql_get_proto_info (db->con)); @@ -285,8 +331,11 @@ static MYSQL *getconnection (mysql_database_t *db) static void set_host (mysql_database_t *db, char *buf, size_t buflen) { - if ((db->host == 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 @@ -316,39 +365,24 @@ static void submit (const char *type, const char *type_instance, plugin_dispatch_values (&vl); } /* submit */ -static void counter_submit (const char *type, const char *type_instance, - derive_t value, mysql_database_t *db) -{ - value_t values[1]; - - values[0].derive = 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); + submit (type, type_instance, &(value_t) { .gauge = value }, 1, db); } /* void gauge_submit */ static void derive_submit (const char *type, const char *type_instance, derive_t value, mysql_database_t *db) { - value_t values[1]; - - values[0].derive = value; - submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); + submit (type, type_instance, &(value_t) { .derive = value }, 1, db); } /* void derive_submit */ static void traffic_submit (derive_t rx, derive_t tx, mysql_database_t *db) { - value_t values[2]; - - values[0].derive = rx; - values[1].derive = tx; + value_t values[] = { + { .derive = rx }, + { .derive = tx }, + }; submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void traffic_submit */ @@ -384,8 +418,8 @@ static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con) MYSQL_RES *res; MYSQL_ROW row; - char *query; - int field_num; + const char *query; + int field_num; unsigned long long position; query = "SHOW MASTER STATUS"; @@ -413,7 +447,7 @@ static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con) } position = atoll (row[1]); - counter_submit ("mysql_log_position", "master-bin", position, db); + derive_submit ("mysql_log_position", "master-bin", position, db); row = mysql_fetch_row (res); if (row != NULL) @@ -430,8 +464,8 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) MYSQL_RES *res; MYSQL_ROW row; - char *query; - int field_num; + const char *query; + int field_num; /* WTF? libmysqlclient does not seem to provide any means to * translate a column name to a column index ... :-/ */ @@ -471,10 +505,10 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) double gauge; counter = atoll (row[READ_MASTER_LOG_POS_IDX]); - counter_submit ("mysql_log_position", "slave-read", counter, db); + derive_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); + derive_submit ("mysql_log_position", "slave-exec", counter, db); if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) { @@ -548,13 +582,191 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) return (0); } /* mysql_read_slave_stats */ -static int mysql_read (user_data_t *ud) +static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con) +{ + MYSQL_RES *res; + MYSQL_ROW row; + + const char *query; + struct { + const char *key; + const 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 }, + + { "os_log_bytes_written", "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 }, + + { "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_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: + derive_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_wsrep_stats (mysql_database_t *db, MYSQL *con) { - mysql_database_t *db; - MYSQL *con; MYSQL_RES *res; MYSQL_ROW row; - char *query; + + const char *query; + struct { + const char *key; + const char *type; + int ds_type; + } metrics[] = { + + { "wsrep_apply_oooe", "operations", DS_TYPE_DERIVE }, + { "wsrep_apply_oool", "operations", DS_TYPE_DERIVE }, + { "wsrep_causal_reads", "operations", DS_TYPE_DERIVE }, + { "wsrep_commit_oooe", "operations", DS_TYPE_DERIVE }, + { "wsrep_commit_oool", "operations", DS_TYPE_DERIVE }, + { "wsrep_flow_control_recv", "operations", DS_TYPE_DERIVE }, + { "wsrep_flow_control_sent", "operations", DS_TYPE_DERIVE }, + { "wsrep_flow_control_paused", "operations", DS_TYPE_DERIVE }, + { "wsrep_local_bf_aborts", "operations", DS_TYPE_DERIVE }, + { "wsrep_local_cert_failures", "operations", DS_TYPE_DERIVE }, + { "wsrep_local_commits", "operations", DS_TYPE_DERIVE }, + { "wsrep_local_replays", "operations", DS_TYPE_DERIVE }, + { "wsrep_received", "operations", DS_TYPE_DERIVE }, + { "wsrep_replicated", "operations", DS_TYPE_DERIVE }, + + { "wsrep_received_bytes", "total_bytes", DS_TYPE_DERIVE }, + { "wsrep_replicated_bytes", "total_bytes", DS_TYPE_DERIVE }, + + { "wsrep_apply_window", "gauge", DS_TYPE_GAUGE }, + { "wsrep_commit_window", "gauge", DS_TYPE_GAUGE }, + + { "wsrep_cluster_size", "gauge", DS_TYPE_GAUGE }, + { "wsrep_cert_deps_distance", "gauge", DS_TYPE_GAUGE }, + + { "wsrep_local_recv_queue", "queue_length", DS_TYPE_GAUGE }, + { "wsrep_local_send_queue", "queue_length", DS_TYPE_GAUGE }, + + { NULL, NULL, 0} + + }; + + query = "SHOW GLOBAL STATUS LIKE 'wsrep_%'"; + + res = exec_query (con, query); + if (res == NULL) + return (-1); + + row = mysql_fetch_row (res); + if (row == NULL) + { + ERROR ("mysql plugin: Failed to get wsrep statistics: " + "`%s' did not return any rows.", query); + mysql_free_result (res); + 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_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); +} /* mysql_read_wsrep_stats */ + +static int mysql_read (user_data_t *ud) +{ + mysql_database_t *db; + MYSQL *con; + MYSQL_RES *res; + MYSQL_ROW row; + const char *query; derive_t qcache_hits = 0; derive_t qcache_inserts = 0; @@ -569,6 +781,7 @@ static int mysql_read (user_data_t *ud) unsigned long long traffic_incoming = 0ULL; unsigned long long traffic_outgoing = 0ULL; + unsigned long mysql_version = 0ULL; if ((ud == NULL) || (ud->data == NULL)) { @@ -582,8 +795,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); @@ -598,7 +813,7 @@ static int mysql_read (user_data_t *ud) key = row[0]; val = atoll (row[1]); - if (strncmp (key, "Com_", + if (strncmp (key, "Com_", strlen ("Com_")) == 0) { if (val == 0ULL) @@ -606,18 +821,18 @@ static int mysql_read (user_data_t *ud) /* Ignore `prepared statements' */ if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0) - counter_submit ("mysql_commands", - key + strlen ("Com_"), + derive_submit ("mysql_commands", + key + strlen ("Com_"), val, db); } - else if (strncmp (key, "Handler_", + else if (strncmp (key, "Handler_", strlen ("Handler_")) == 0) { if (val == 0ULL) continue; - counter_submit ("mysql_handler", - key + strlen ("Handler_"), + derive_submit ("mysql_handler", + key + strlen ("Handler_"), val, db); } else if (strncmp (key, "Qcache_", @@ -634,7 +849,7 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Qcache_queries_in_cache") == 0) qcache_queries_in_cache = (gauge_t) val; } - else if (strncmp (key, "Bytes_", + else if (strncmp (key, "Bytes_", strlen ("Bytes_")) == 0) { if (strcmp (key, "Bytes_received") == 0) @@ -642,7 +857,7 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Bytes_sent") == 0) traffic_outgoing += val; } - else if (strncmp (key, "Threads_", + else if (strncmp (key, "Threads_", strlen ("Threads_")) == 0) { if (strcmp (key, "Threads_running") == 0) @@ -657,10 +872,121 @@ static int mysql_read (user_data_t *ud) else if (strncmp (key, "Table_locks_", strlen ("Table_locks_")) == 0) { - counter_submit ("mysql_locks", + derive_submit ("mysql_locks", 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) + derive_submit ("mysql_bpool_counters", "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) + derive_submit ("mysql_bpool_counters", "read_ahead_rnd", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_ahead") == 0) + derive_submit ("mysql_bpool_counters", "read_ahead", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_ahead_evicted") == 0) + derive_submit ("mysql_bpool_counters", "read_ahead_evicted", val, db); + else if (strcmp (key, "Innodb_buffer_pool_read_requests") == 0) + derive_submit ("mysql_bpool_counters", "read_requests", val, db); + else if (strcmp (key, "Innodb_buffer_pool_reads") == 0) + derive_submit ("mysql_bpool_counters", "reads", val, db); + else if (strcmp (key, "Innodb_buffer_pool_wait_free") == 0) + derive_submit ("mysql_bpool_counters", "wait_free", val, db); + else if (strcmp (key, "Innodb_buffer_pool_write_requests") == 0) + derive_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) + derive_submit ("mysql_innodb_data", "fsyncs", val, db); + else if (strcmp (key, "Innodb_data_read") == 0) + derive_submit ("mysql_innodb_data", "read", val, db); + else if (strcmp (key, "Innodb_data_reads") == 0) + derive_submit ("mysql_innodb_data", "reads", val, db); + else if (strcmp (key, "Innodb_data_writes") == 0) + derive_submit ("mysql_innodb_data", "writes", val, db); + else if (strcmp (key, "Innodb_data_written") == 0) + derive_submit ("mysql_innodb_data", "written", val, db); + + /* double write */ + else if (strcmp (key, "Innodb_dblwr_writes") == 0) + derive_submit ("mysql_innodb_dblwr", "writes", val, db); + else if (strcmp (key, "Innodb_dblwr_pages_written") == 0) + derive_submit ("mysql_innodb_dblwr", "written", val, db); + else if (strcmp (key, "Innodb_dblwr_page_size") == 0) + gauge_submit ("mysql_innodb_dblwr", "page_size", val, db); + + /* log */ + else if (strcmp (key, "Innodb_log_waits") == 0) + derive_submit ("mysql_innodb_log", "waits", val, db); + else if (strcmp (key, "Innodb_log_write_requests") == 0) + derive_submit ("mysql_innodb_log", "write_requests", val, db); + else if (strcmp (key, "Innodb_log_writes") == 0) + derive_submit ("mysql_innodb_log", "writes", val, db); + else if (strcmp (key, "Innodb_os_log_fsyncs") == 0) + derive_submit ("mysql_innodb_log", "fsyncs", val, db); + else if (strcmp (key, "Innodb_os_log_written") == 0) + derive_submit ("mysql_innodb_log", "written", val, db); + + /* pages */ + else if (strcmp (key, "Innodb_pages_created") == 0) + derive_submit ("mysql_innodb_pages", "created", val, db); + else if (strcmp (key, "Innodb_pages_read") == 0) + derive_submit ("mysql_innodb_pages", "read", val, db); + else if (strcmp (key, "Innodb_pages_written") == 0) + derive_submit ("mysql_innodb_pages", "written", val, db); + + /* row lock */ + else if (strcmp (key, "Innodb_row_lock_time") == 0) + derive_submit ("mysql_innodb_row_lock", "time", val, db); + else if (strcmp (key, "Innodb_row_lock_waits") == 0) + derive_submit ("mysql_innodb_row_lock", "waits", val, db); + + /* rows */ + else if (strcmp (key, "Innodb_rows_deleted") == 0) + derive_submit ("mysql_innodb_rows", "deleted", val, db); + else if (strcmp (key, "Innodb_rows_inserted") == 0) + derive_submit ("mysql_innodb_rows", "inserted", val, db); + else if (strcmp (key, "Innodb_rows_read") == 0) + derive_submit ("mysql_innodb_rows", "read", val, db); + else if (strcmp (key, "Innodb_rows_updated") == 0) + derive_submit ("mysql_innodb_rows", "updated", val, db); + } + else if (strncmp (key, "Select_", strlen ("Select_")) == 0) + { + derive_submit ("mysql_select", key + strlen ("Select_"), + val, db); + } + else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0) + { + if (strcmp (key, "Sort_merge_passes") == 0) + derive_submit ("mysql_sort_merge_passes", NULL, val, db); + else if (strcmp (key, "Sort_rows") == 0) + derive_submit ("mysql_sort_rows", NULL, val, db); + else if (strcmp (key, "Sort_range") == 0) + derive_submit ("mysql_sort", "range", val, db); + else if (strcmp (key, "Sort_scan") == 0) + derive_submit ("mysql_sort", "scan", val, db); + + } + else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) + { + derive_submit ("mysql_slow_queries", NULL , val, db); + } } mysql_free_result (res); res = NULL; @@ -697,12 +1023,18 @@ static int mysql_read (user_data_t *ud) 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); if ((db->slave_stats) || (db->slave_notif)) mysql_read_slave_stats (db, con); + if (db->wsrep_stats) + mysql_read_wsrep_stats (db, con); + return (0); } /* int mysql_read */