From: Florian Forster <octo@collectd.org>
Date: Mon, 8 Aug 2016 06:41:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1845'
X-Git-Tag: collectd-5.6.0~80
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1fdd8908119bdd99c0b3c18961f93e0a1be41eec;hp=4f4ad5dd93776f330a0fb28fbece7157108e0c4c

Merge remote-tracking branch 'github/pr/1845'
---

diff --git a/src/mysql.c b/src/mysql.c
index 177563c8..6ba30057 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -580,40 +580,12 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con)
 		{ "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 },
@@ -628,9 +600,6 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con)
 		{ "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 },
@@ -913,6 +882,8 @@ static int mysql_read (user_data_t *ud)
 				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_wait_free") == 0)
+				counter_submit ("mysql_bpool_counters", "wait_free", 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)
@@ -937,6 +908,8 @@ static int mysql_read (user_data_t *ud)
 				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);
+			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)