remove double reported innodb metrics

[collectd.git] / src / mysql.c

diff --git a/src/mysql.c b/src/mysql.c
index 419a154..08f536f 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
@@ -103,7 +104,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))
@@ -143,7 +143,7 @@ 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;
 
@@ -221,13 +221,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;
 
@@ -579,40 +577,14 @@ 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 },
@@ -627,8 +599,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 },