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

diff --combined src/mysql.c
index 177563c,65e7692..6ba3005
--- 1/src/mysql.c
--- 2/src/mysql.c
+++ b/src/mysql.c
@@@ -54,7 -54,6 +54,7 @@@ struct mysql_database_s /* {{{ *
        _Bool master_stats;
        _Bool slave_stats;
        _Bool innodb_stats;
 +      _Bool wsrep_stats;
  
        _Bool slave_notif;
        _Bool slave_io_running;
@@@ -179,8 -178,6 +179,8 @@@ static int mysql_config_database (oconf
                        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);
@@@ -580,40 -577,12 +580,12 @@@ static int mysql_read_innodb_stats (mys
                { "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 -597,6 +600,6 @@@
                { "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 },
@@@ -685,93 -651,6 +654,93 @@@
        return (0);
  }
  
 +static int mysql_read_wsrep_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[] = {
 +
 +              { "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;
@@@ -913,6 -792,8 +882,8 @@@
                                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 -818,8 +908,8 @@@
                                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)
@@@ -1040,9 -923,6 +1013,9 @@@
        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 */