From: Rachid Zarouali Date: Thu, 4 Aug 2016 07:10:13 +0000 (+0200) Subject: mysql plugin: add support for Galera statistics X-Git-Tag: collectd-5.6.0~108^2 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2633870ff70e8930c3e637970e775a6265ab26f0 mysql plugin: add support for Galera statistics --- diff --git a/.gitignore b/.gitignore index d7423895..b85dc48a 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,9 @@ bindings/java/org/collectd/java/*.class # lint stuff *.ln +#ide stuff +.vscode + # Unit tests src/daemon/test-suite.log src/tests/ diff --git a/src/collectd.conf.in b/src/collectd.conf.in index b678c425..1e8994ee 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -741,6 +741,12 @@ # SlaveStats true # SlaveNotifications true # +# +# Alias "galera" +# Host "localhost" +# Socket "/var/run/mysql/mysqld.sock" +# WsrepStats true +# # # diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index ac06547f..3e11e063 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -3661,6 +3661,13 @@ Synopsis: SlaveStats true SlaveNotifications true + + + Alias "galera" + Host "localhost" + Socket "/var/run/mysql/mysqld.sock" + WsrepStats true + A B block defines one connection to a MySQL database. It accepts a @@ -3731,6 +3738,12 @@ privileges. See the B documentation above. Defaults to B. If enabled, the plugin sends a notification if the replication slave I/O and / or SQL threads are not running. Defaults to B. +=item B I + + Enable the collection of wsrep plugin statistics, used in Master-Master + replication setups like in MySQL Galera/Percona XtraDB Cluster. + User needs only privileges to execute 'SHOW GLOBAL STATUS' + =item B I Sets the connect timeout for the MySQL client. diff --git a/src/mysql.c b/src/mysql.c index 54236dac..20c9004c 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -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,6 +180,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); @@ -685,6 +688,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; @@ -953,6 +1043,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 */