X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=bf77a2fff3c9545b4e6fe036f673cea3da64d7ba;hb=cce136946b879557f91183e4de58e92b81e138c8;hp=7d5eddd17bce73fd85ff84420b27b159569cad43;hpb=103f05e098865196fc5f28df51e99b64fd6b5202;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 7d5eddd1..bf77a2ff 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -213,7 +213,7 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ plugin_register_complex_read (/* group = */ NULL, cb_name, mysql_read, - /* interval = */ NULL, &ud); + /* interval = */ 0, &ud); } else { @@ -567,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; @@ -588,6 +712,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)) { @@ -601,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); @@ -688,7 +815,7 @@ static int mysql_read (user_data_t *ud) 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_counters", "flushed", val, db); + 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) @@ -707,6 +834,10 @@ static int mysql_read (user_data_t *ud) 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) @@ -716,7 +847,7 @@ static int mysql_read (user_data_t *ud) 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_bpool_counters", "writes", val, db); + counter_submit ("mysql_innodb_data", "writes", val, db); else if (strcmp (key, "Innodb_data_written") == 0) counter_submit ("mysql_innodb_data", "written", val, db); @@ -726,6 +857,32 @@ static int mysql_read (user_data_t *ud) 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); @@ -782,6 +939,9 @@ 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);