X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=6ba30057d7f343c8b55c9859fcadd81a5f074949;hb=1fdd8908119bdd99c0b3c18961f93e0a1be41eec;hp=a2394137532d8fe54560eb1bc69a30d99b6357d5;hpb=aef15b632b9f415e5ebfadd4e41fa8a3c19407ee;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index a2394137..6ba30057 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
@@ -53,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;
@@ -71,7 +73,7 @@ static void mysql_database_free (void *arg) /* {{{ */
 
 	DEBUG ("mysql plugin: mysql_database_free (arg = %p);", arg);
 
-	db = (mysql_database_t *) arg;
+	db = arg;
 
 	if (db == NULL)
 		return;
@@ -103,7 +105,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 +144,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;
 
@@ -178,6 +179,8 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 			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);
@@ -191,13 +194,12 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 	/* If all went well, register this database for reading */
 	if (status == 0)
 	{
-		user_data_t ud;
+		user_data_t ud = { 0 };
 		char cb_name[DATA_MAX_NAME_LEN];
 
 		DEBUG ("mysql plugin: Registering new read callback: %s",
 				(db->database != NULL) ? db->database : "<default>");
 
-		memset (&ud, 0, sizeof (ud));
 		ud.data = (void *) db;
 		ud.free_func = mysql_database_free;
 
@@ -222,13 +224,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;
 
@@ -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 },
@@ -685,6 +654,93 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con)
 	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;
@@ -826,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)
@@ -850,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)
@@ -904,6 +964,10 @@ static int mysql_read (user_data_t *ud)
 				counter_submit ("mysql_sort", "scan", val, db);
 
 		}
+		else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) 
+		{
+			counter_submit ("mysql_slow_queries", NULL , val, db);
+		}
 	}
 	mysql_free_result (res); res = NULL;
 
@@ -949,6 +1013,9 @@ static int mysql_read (user_data_t *ud)
 	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 */