X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=8a1692064b534dda25db368fdb77830cbebdcf15;hb=5c2993e4121feae745551be182221b31bc23ff97;hp=eaa03719c5216b23ba316273af40aa654bc891e3;hpb=25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index eaa03719..8a169206 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -65,9 +65,6 @@ 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; @@ -213,7 +210,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 { @@ -403,8 +400,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"; @@ -449,8 +446,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 ... :-/ */ @@ -572,84 +569,84 @@ 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} - }; + 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 }, + + { "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'"; @@ -659,45 +656,43 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con) while ((row = mysql_fetch_row (res))) { - int i; + 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); + 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; - MYSQL *con; - MYSQL_RES *res; - MYSQL_ROW row; - char *query; + MYSQL *con; + MYSQL_RES *res; + MYSQL_ROW row; + const char *query; derive_t qcache_hits = 0; derive_t qcache_inserts = 0; @@ -712,7 +707,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; + unsigned long mysql_version = 0ULL; if ((ud == NULL) || (ud->data == NULL)) { @@ -726,7 +721,7 @@ static int mysql_read (user_data_t *ud) if ((con = getconnection (db)) == NULL) return (-1); - mysql_version = mysql_get_server_version(con); + mysql_version = mysql_get_server_version(con); query = "SHOW STATUS"; if (mysql_version >= 50002) @@ -940,7 +935,7 @@ 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); + mysql_read_innodb_stats (db, con); if (db->master_stats) mysql_read_master_stats (db, con);