X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=a64b0e5bc96a6125757abb17da6548a1b13473fe;hb=1aa4295ba6875ceb02a7383237bc2485ffab9c1e;hp=177563c83d37d60a0c727e47efab7dbe16ca3e5f;hpb=6159b6f81403b90eb2b1f1c60fa8006cd3405d1b;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 177563c8..a64b0e5b 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -31,7 +31,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #ifdef HAVE_MYSQL_H #include @@ -47,6 +46,14 @@ struct mysql_database_s /* {{{ */ char *user; char *pass; char *database; + + /* mysql_ssl_set params */ + char *key; + char *cert; + char *ca; + char *capath; + char *cipher; + char *socket; int port; int timeout; @@ -88,6 +95,11 @@ static void mysql_database_free (void *arg) /* {{{ */ sfree (db->socket); sfree (db->instance); sfree (db->database); + sfree (db->key); + sfree (db->cert); + sfree (db->ca); + sfree (db->capath); + sfree (db->cipher); sfree (db); } /* }}} void mysql_database_free */ @@ -127,6 +139,12 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ db->user = NULL; db->pass = NULL; db->database = NULL; + db->key = NULL; + db->cert = NULL; + db->ca = NULL; + db->capath = NULL; + db->cipher = NULL; + db->socket = NULL; db->con = NULL; db->timeout = 0; @@ -169,6 +187,16 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ status = cf_util_get_string (child, &db->socket); else if (strcasecmp ("Database", child->key) == 0) status = cf_util_get_string (child, &db->database); + else if (strcasecmp ("SSLKey", child->key) == 0) + status = cf_util_get_string (child, &db->key); + else if (strcasecmp ("SSLCert", child->key) == 0) + status = cf_util_get_string (child, &db->cert); + else if (strcasecmp ("SSLCA", child->key) == 0) + status = cf_util_get_string (child, &db->ca); + else if (strcasecmp ("SSLCAPath", child->key) == 0) + status = cf_util_get_string (child, &db->capath); + else if (strcasecmp ("SSLCipher", child->key) == 0) + status = cf_util_get_string (child, &db->cipher); else if (strcasecmp ("ConnectTimeout", child->key) == 0) status = cf_util_get_int (child, &db->timeout); else if (strcasecmp ("MasterStats", child->key) == 0) @@ -194,15 +222,11 @@ 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 = { 0 }; char cb_name[DATA_MAX_NAME_LEN]; DEBUG ("mysql plugin: Registering new read callback: %s", (db->database != NULL) ? db->database : ""); - ud.data = (void *) db; - ud.free_func = mysql_database_free; - if (db->instance != NULL) ssnprintf (cb_name, sizeof (cb_name), "mysql-%s", db->instance); @@ -210,8 +234,10 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ sstrncpy (cb_name, "mysql", sizeof (cb_name)); plugin_register_complex_read (/* group = */ NULL, cb_name, - mysql_read, - /* interval = */ 0, &ud); + mysql_read, /* interval = */ 0, &(user_data_t) { + .data = db, + .free_func = mysql_database_free, + }); } else { @@ -246,6 +272,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ static MYSQL *getconnection (mysql_database_t *db) { + const char *cipher; + if (db->is_connected) { int status; @@ -273,6 +301,8 @@ static MYSQL *getconnection (mysql_database_t *db) /* Configure TCP connect timeout (default: 0) */ db->con->options.connect_timeout = db->timeout; + mysql_ssl_set (db->con, db->key, db->cert, db->ca, db->capath, db->cipher); + if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) { @@ -284,10 +314,14 @@ static MYSQL *getconnection (mysql_database_t *db) return (NULL); } + cipher = mysql_get_ssl_cipher (db->con); + INFO ("mysql plugin: Successfully connected to database %s " - "at server %s (server version: %s, protocol version: %d)", + "at server %s with cipher %s " + "(server version: %s, protocol version: %d) ", (db->database != NULL) ? db->database : "", mysql_get_host_info (db->con), + (cipher != NULL) ? cipher : "", mysql_get_server_info (db->con), mysql_get_proto_info (db->con)); @@ -331,39 +365,24 @@ static void submit (const char *type, const char *type_instance, plugin_dispatch_values (&vl); } /* submit */ -static void counter_submit (const char *type, const char *type_instance, - derive_t value, mysql_database_t *db) -{ - value_t values[1]; - - values[0].derive = value; - submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); -} /* void counter_submit */ - static void gauge_submit (const char *type, const char *type_instance, gauge_t value, mysql_database_t *db) { - value_t values[1]; - - values[0].gauge = value; - submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); + submit (type, type_instance, &(value_t) { .gauge = value }, 1, db); } /* void gauge_submit */ static void derive_submit (const char *type, const char *type_instance, derive_t value, mysql_database_t *db) { - value_t values[1]; - - values[0].derive = value; - submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db); + submit (type, type_instance, &(value_t) { .derive = value }, 1, db); } /* void derive_submit */ static void traffic_submit (derive_t rx, derive_t tx, mysql_database_t *db) { - value_t values[2]; - - values[0].derive = rx; - values[1].derive = tx; + value_t values[] = { + { .derive = rx }, + { .derive = tx }, + }; submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db); } /* void traffic_submit */ @@ -428,7 +447,7 @@ static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con) } position = atoll (row[1]); - counter_submit ("mysql_log_position", "master-bin", position, db); + derive_submit ("mysql_log_position", "master-bin", position, db); row = mysql_fetch_row (res); if (row != NULL) @@ -486,10 +505,10 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) double gauge; counter = atoll (row[READ_MASTER_LOG_POS_IDX]); - counter_submit ("mysql_log_position", "slave-read", counter, db); + derive_submit ("mysql_log_position", "slave-read", counter, db); counter = atoll (row[EXEC_MASTER_LOG_POS_IDX]); - counter_submit ("mysql_log_position", "slave-exec", counter, db); + derive_submit ("mysql_log_position", "slave-exec", counter, db); if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) { @@ -580,40 +599,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 +619,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 }, @@ -670,7 +658,7 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con) switch (metrics[i].ds_type) { case DS_TYPE_COUNTER: - counter_submit(metrics[i].type, key, (counter_t)val, db); + derive_submit(metrics[i].type, key, (counter_t)val, db); break; case DS_TYPE_GAUGE: gauge_submit(metrics[i].type, key, (gauge_t)val, db); @@ -833,7 +821,7 @@ static int mysql_read (user_data_t *ud) /* Ignore `prepared statements' */ if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0) - counter_submit ("mysql_commands", + derive_submit ("mysql_commands", key + strlen ("Com_"), val, db); } @@ -843,7 +831,7 @@ static int mysql_read (user_data_t *ud) if (val == 0ULL) continue; - counter_submit ("mysql_handler", + derive_submit ("mysql_handler", key + strlen ("Handler_"), val, db); } @@ -884,7 +872,7 @@ static int mysql_read (user_data_t *ud) else if (strncmp (key, "Table_locks_", strlen ("Table_locks_")) == 0) { - counter_submit ("mysql_locks", + derive_submit ("mysql_locks", key + strlen ("Table_locks_"), val, db); } @@ -896,7 +884,7 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Innodb_buffer_pool_pages_dirty") == 0) gauge_submit ("mysql_bpool_pages", "dirty", val, db); else if (strcmp (key, "Innodb_buffer_pool_pages_flushed") == 0) - counter_submit ("mysql_bpool_counters", "pages_flushed", val, db); + derive_submit ("mysql_bpool_counters", "pages_flushed", val, db); else if (strcmp (key, "Innodb_buffer_pool_pages_free") == 0) gauge_submit ("mysql_bpool_pages", "free", val, db); else if (strcmp (key, "Innodb_buffer_pool_pages_misc") == 0) @@ -904,17 +892,19 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Innodb_buffer_pool_pages_total") == 0) gauge_submit ("mysql_bpool_pages", "total", val, db); else if (strcmp (key, "Innodb_buffer_pool_read_ahead_rnd") == 0) - counter_submit ("mysql_bpool_counters", "read_ahead_rnd", val, db); + derive_submit ("mysql_bpool_counters", "read_ahead_rnd", val, db); else if (strcmp (key, "Innodb_buffer_pool_read_ahead") == 0) - counter_submit ("mysql_bpool_counters", "read_ahead", val, db); + derive_submit ("mysql_bpool_counters", "read_ahead", val, db); else if (strcmp (key, "Innodb_buffer_pool_read_ahead_evicted") == 0) - counter_submit ("mysql_bpool_counters", "read_ahead_evicted", val, db); + derive_submit ("mysql_bpool_counters", "read_ahead_evicted", val, db); else if (strcmp (key, "Innodb_buffer_pool_read_requests") == 0) - counter_submit ("mysql_bpool_counters", "read_requests", val, db); + derive_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); + derive_submit ("mysql_bpool_counters", "reads", val, db); + else if (strcmp (key, "Innodb_buffer_pool_wait_free") == 0) + derive_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); + derive_submit ("mysql_bpool_counters", "write_requests", val, db); else if (strcmp (key, "Innodb_buffer_pool_bytes_data") == 0) gauge_submit ("mysql_bpool_bytes", "data", val, db); else if (strcmp (key, "Innodb_buffer_pool_bytes_dirty") == 0) @@ -922,78 +912,80 @@ static int mysql_read (user_data_t *ud) /* data */ if (strcmp (key, "Innodb_data_fsyncs") == 0) - counter_submit ("mysql_innodb_data", "fsyncs", val, db); + derive_submit ("mysql_innodb_data", "fsyncs", val, db); else if (strcmp (key, "Innodb_data_read") == 0) - counter_submit ("mysql_innodb_data", "read", val, db); + derive_submit ("mysql_innodb_data", "read", val, db); else if (strcmp (key, "Innodb_data_reads") == 0) - counter_submit ("mysql_innodb_data", "reads", val, db); + derive_submit ("mysql_innodb_data", "reads", val, db); else if (strcmp (key, "Innodb_data_writes") == 0) - counter_submit ("mysql_innodb_data", "writes", val, db); + derive_submit ("mysql_innodb_data", "writes", val, db); else if (strcmp (key, "Innodb_data_written") == 0) - counter_submit ("mysql_innodb_data", "written", val, db); + derive_submit ("mysql_innodb_data", "written", val, db); /* double write */ else if (strcmp (key, "Innodb_dblwr_writes") == 0) - counter_submit ("mysql_innodb_dblwr", "writes", val, db); + derive_submit ("mysql_innodb_dblwr", "writes", val, db); else if (strcmp (key, "Innodb_dblwr_pages_written") == 0) - counter_submit ("mysql_innodb_dblwr", "written", val, db); + derive_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) - counter_submit ("mysql_innodb_log", "waits", val, db); + derive_submit ("mysql_innodb_log", "waits", val, db); else if (strcmp (key, "Innodb_log_write_requests") == 0) - counter_submit ("mysql_innodb_log", "write_requests", val, db); + derive_submit ("mysql_innodb_log", "write_requests", val, db); else if (strcmp (key, "Innodb_log_writes") == 0) - counter_submit ("mysql_innodb_log", "writes", val, db); + derive_submit ("mysql_innodb_log", "writes", val, db); else if (strcmp (key, "Innodb_os_log_fsyncs") == 0) - counter_submit ("mysql_innodb_log", "fsyncs", val, db); + derive_submit ("mysql_innodb_log", "fsyncs", val, db); else if (strcmp (key, "Innodb_os_log_written") == 0) - counter_submit ("mysql_innodb_log", "written", val, db); + derive_submit ("mysql_innodb_log", "written", val, db); /* pages */ else if (strcmp (key, "Innodb_pages_created") == 0) - counter_submit ("mysql_innodb_pages", "created", val, db); + derive_submit ("mysql_innodb_pages", "created", val, db); else if (strcmp (key, "Innodb_pages_read") == 0) - counter_submit ("mysql_innodb_pages", "read", val, db); + derive_submit ("mysql_innodb_pages", "read", val, db); else if (strcmp (key, "Innodb_pages_written") == 0) - counter_submit ("mysql_innodb_pages", "written", val, db); + derive_submit ("mysql_innodb_pages", "written", val, db); /* row lock */ else if (strcmp (key, "Innodb_row_lock_time") == 0) - counter_submit ("mysql_innodb_row_lock", "time", val, db); + derive_submit ("mysql_innodb_row_lock", "time", val, db); else if (strcmp (key, "Innodb_row_lock_waits") == 0) - counter_submit ("mysql_innodb_row_lock", "waits", val, db); + derive_submit ("mysql_innodb_row_lock", "waits", val, db); /* rows */ else if (strcmp (key, "Innodb_rows_deleted") == 0) - counter_submit ("mysql_innodb_rows", "deleted", val, db); + derive_submit ("mysql_innodb_rows", "deleted", val, db); else if (strcmp (key, "Innodb_rows_inserted") == 0) - counter_submit ("mysql_innodb_rows", "inserted", val, db); + derive_submit ("mysql_innodb_rows", "inserted", val, db); else if (strcmp (key, "Innodb_rows_read") == 0) - counter_submit ("mysql_innodb_rows", "read", val, db); + derive_submit ("mysql_innodb_rows", "read", val, db); else if (strcmp (key, "Innodb_rows_updated") == 0) - counter_submit ("mysql_innodb_rows", "updated", val, db); + derive_submit ("mysql_innodb_rows", "updated", val, db); } else if (strncmp (key, "Select_", strlen ("Select_")) == 0) { - counter_submit ("mysql_select", key + strlen ("Select_"), + derive_submit ("mysql_select", key + strlen ("Select_"), val, db); } else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0) { if (strcmp (key, "Sort_merge_passes") == 0) - counter_submit ("mysql_sort_merge_passes", NULL, val, db); + derive_submit ("mysql_sort_merge_passes", NULL, val, db); else if (strcmp (key, "Sort_rows") == 0) - counter_submit ("mysql_sort_rows", NULL, val, db); + derive_submit ("mysql_sort_rows", NULL, val, db); else if (strcmp (key, "Sort_range") == 0) - counter_submit ("mysql_sort", "range", val, db); + derive_submit ("mysql_sort", "range", val, db); else if (strcmp (key, "Sort_scan") == 0) - counter_submit ("mysql_sort", "scan", val, db); + derive_submit ("mysql_sort", "scan", val, db); } - else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) + else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) { - counter_submit ("mysql_slow_queries", NULL , val, db); + derive_submit ("mysql_slow_queries", NULL , val, db); } } mysql_free_result (res); res = NULL;