X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=bfdbb76667aebc80d4a11f8a0714294b09cbdc94;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hp=2314f230d0dd5020df65bd0fd50d7759daaeb04d;hpb=e50ee93879e8f7c0f0688e4b4dfe87ca40d0e6d1;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 2314f230..bfdbb766 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,7 +1,10 @@ /** * collectd - src/mysql.c * Copyright (C) 2006-2009 Florian octo Forster - * Copyright (C) 2009 Sebastian tokkee Harl + * Copyright (C) 2008 Mirko Buffoni + * Copyright (C) 2009 Doug MacEachern + * Copyright (C) 2009 Sebastian tokkee Harl + * Copyright (C) 2009 Rodolphe Quiédeville * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -18,7 +21,10 @@ * * Authors: * Florian octo Forster + * Mirko Buffoni + * Doug MacEachern * Sebastian tokkee Harl + * Rodolphe Quiédeville **/ #include "collectd.h" @@ -48,6 +54,10 @@ struct mysql_database_s /* {{{ */ int master_stats; int slave_stats; + int slave_notif; + int slave_io_running; + int slave_sql_running; + MYSQL *con; int state; }; @@ -197,6 +207,10 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ db->socket = NULL; db->con = NULL; + /* trigger a notification, if it's not running */ + db->slave_io_running = 1; + db->slave_sql_running = 1; + plugin_block = 1; if (strcasecmp ("Plugin", ci->key) == 0) { @@ -212,7 +226,6 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ return (status); } assert (db->instance != NULL); - db->database = strdup (db->instance); } else { @@ -255,6 +268,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ status = mysql_config_set_boolean (&db->master_stats, child); else if (strcasecmp ("SlaveStats", child->key) == 0) status = mysql_config_set_boolean (&db->slave_stats, child); + else if (strcasecmp ("SlaveNotifications", child->key) == 0) + status = mysql_config_set_boolean (&db->slave_notif, child); else { WARNING ("mysql plugin: Option `%s' not allowed here.", child->key); @@ -305,11 +320,6 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ db->port); status = -1; } - if (db->database == NULL) - { - ERROR ("mysql plugin: No `Database' configured"); - status = -1; - } break; } /* while (status == 0) */ @@ -319,7 +329,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ user_data_t ud; char cb_name[DATA_MAX_NAME_LEN]; - DEBUG ("mysql plugin: Registering new read callback: %s", db->database); + DEBUG ("mysql plugin: Registering new read callback: %s", + (db->database != NULL) ? db->database : ""); memset (&ud, 0, sizeof (ud)); ud.data = (void *) db; @@ -331,7 +342,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */ else sstrncpy (cb_name, "mysql", sizeof (cb_name)); - plugin_register_complex_read (cb_name, mysql_read, + plugin_register_complex_read (/* group = */ NULL, cb_name, + mysql_read, /* interval = */ NULL, &ud); } else @@ -352,7 +364,11 @@ static MYSQL *getconnection (mysql_database_t *db) int err; if ((err = mysql_ping (db->con)) != 0) { - WARNING ("mysql_ping failed: %s", mysql_error (db->con)); + WARNING ("mysql_ping failed for %s: %s", + (db->instance != NULL) + ? db->instance + : "", + mysql_error (db->con)); db->state = 0; } else @@ -372,42 +388,51 @@ static MYSQL *getconnection (mysql_database_t *db) if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) { - ERROR ("mysql_real_connect failed: %s", mysql_error (db->con)); + ERROR ("mysql plugin: Failed to connect to database %s " + "at server %s: %s", + (db->database != NULL) ? db->database : "", + (db->host != NULL) ? db->host : "localhost", + mysql_error (db->con)); db->state = 0; return (NULL); } else { + INFO ("mysql plugin: Successfully connected to database %s " + "at server %s (server version: %s, protocol version: %d)", + (db->database != NULL) ? db->database : "", + mysql_get_host_info (db->con), + mysql_get_server_info (db->con), + mysql_get_proto_info (db->con)); db->state = 1; return (db->con); } } /* static MYSQL *getconnection (mysql_database_t *db) */ -static void set_host (mysql_database_t *db, value_list_t *vl) +static void set_host (mysql_database_t *db, char *buf, size_t buflen) { /* XXX legacy mode - use hostname_g */ if (db->instance == NULL) - sstrncpy (vl->host, hostname_g, sizeof (vl->host)); + sstrncpy (buf, hostname_g, buflen); else { if ((db->host == NULL) || (strcmp ("", db->host) == 0) || (strcmp ("localhost", db->host) == 0)) - sstrncpy (vl->host, hostname_g, sizeof (vl->host)); + sstrncpy (buf, hostname_g, buflen); else - sstrncpy (vl->host, db->host, sizeof (vl->host)); + sstrncpy (buf, db->host, buflen); } } -static void set_plugin_instance (mysql_database_t *db, value_list_t *vl) +static void set_plugin_instance (mysql_database_t *db, + char *buf, size_t buflen) { /* XXX legacy mode - no plugin_instance */ if (db->instance == NULL) - sstrncpy (vl->plugin_instance, "", - sizeof (vl->plugin_instance)); + sstrncpy (buf, "", buflen); else - sstrncpy (vl->plugin_instance, db->instance, - sizeof (vl->plugin_instance)); + sstrncpy (buf, db->instance, buflen); } static void submit (const char *type, const char *type_instance, @@ -418,10 +443,10 @@ static void submit (const char *type, const char *type_instance, vl.values = values; vl.values_len = values_len; - set_host (db, &vl); + set_host (db, vl.host, sizeof (vl.host)); sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); - set_plugin_instance (db, &vl); + set_plugin_instance (db, vl.plugin_instance, sizeof (vl.plugin_instance)); sstrncpy (vl.type, type, sizeof (vl.type)); if (type_instance != NULL) @@ -567,12 +592,11 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) /* WTF? libmysqlclient does not seem to provide any means to * translate a column name to a column index ... :-/ */ const int READ_MASTER_LOG_POS_IDX = 6; + const int SLAVE_IO_RUNNING_IDX = 10; + const int SLAVE_SQL_RUNNING_IDX = 11; const int EXEC_MASTER_LOG_POS_IDX = 21; const int SECONDS_BEHIND_MASTER_IDX = 32; - unsigned long long counter; - double gauge; - query = "SHOW SLAVE STATUS"; res = exec_query (con, query); @@ -595,16 +619,75 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con) return (-1); } - counter = atoll (row[READ_MASTER_LOG_POS_IDX]); - counter_submit ("mysql_log_position", "slave-read", counter, db); + if (db->slave_stats) + { + unsigned long long counter; + double gauge; + + counter = atoll (row[READ_MASTER_LOG_POS_IDX]); + counter_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); - counter = atoll (row[EXEC_MASTER_LOG_POS_IDX]); - counter_submit ("mysql_log_position", "slave-exec", counter, db); + if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) + { + gauge = atof (row[SECONDS_BEHIND_MASTER_IDX]); + gauge_submit ("time_offset", NULL, gauge, db); + } + } - if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) + if (db->slave_notif) { - gauge = atof (row[SECONDS_BEHIND_MASTER_IDX]); - gauge_submit ("time_offset", NULL, gauge, db); + notification_t n = { 0, time (NULL), "", "", + "mysql", "", "time_offset", "", NULL }; + + char *io, *sql; + + io = row[SLAVE_IO_RUNNING_IDX]; + sql = row[SLAVE_SQL_RUNNING_IDX]; + + set_host (db, n.host, sizeof (n.host)); + set_plugin_instance (db, + n.plugin_instance, sizeof (n.plugin_instance)); + + if (((io == NULL) || (strcasecmp (io, "yes") != 0)) + && (db->slave_io_running)) + { + n.severity = NOTIF_WARNING; + ssnprintf (n.message, sizeof (n.message), + "slave I/O thread not started or not connected to master"); + plugin_dispatch_notification (&n); + db->slave_io_running = 0; + } + else if (((io != NULL) && (strcasecmp (io, "yes") == 0)) + && (! db->slave_io_running)) + { + n.severity = NOTIF_OKAY; + ssnprintf (n.message, sizeof (n.message), + "slave I/O thread started and connected to master"); + plugin_dispatch_notification (&n); + db->slave_io_running = 1; + } + + if (((sql == NULL) || (strcasecmp (sql, "yes") != 0)) + && (db->slave_sql_running)) + { + n.severity = NOTIF_WARNING; + ssnprintf (n.message, sizeof (n.message), + "slave SQL thread not started"); + plugin_dispatch_notification (&n); + db->slave_sql_running = 0; + } + else if (((sql != NULL) && (strcasecmp (sql, "yes") == 0)) + && (! db->slave_sql_running)) + { + n.severity = NOTIF_OKAY; + ssnprintf (n.message, sizeof (n.message), + "slave SQL thread started"); + plugin_dispatch_notification (&n); + db->slave_sql_running = 0; + } } row = mysql_fetch_row (res); @@ -624,7 +707,6 @@ static int mysql_read (user_data_t *ud) MYSQL_RES *res; MYSQL_ROW row; char *query; - int field_num; unsigned long long qcache_hits = 0ULL; unsigned long long qcache_inserts = 0ULL; @@ -660,7 +742,7 @@ static int mysql_read (user_data_t *ud) if (res == NULL) return (-1); - field_num = mysql_num_fields (res); + mysql_num_fields (res); while ((row = mysql_fetch_row (res))) { char *key; @@ -669,23 +751,30 @@ static int mysql_read (user_data_t *ud) key = row[0]; val = atoll (row[1]); - if (strncmp (key, "Com_", 4) == 0) + if (strncmp (key, "Com_", + strlen ("Com_")) == 0) { if (val == 0ULL) continue; /* Ignore `prepared statements' */ - if (strncmp (key, "Com_stmt_", 9) != 0) - counter_submit ("mysql_commands", key + 4, val, db); + if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0) + counter_submit ("mysql_commands", + key + strlen ("Com_"), + val, db); } - else if (strncmp (key, "Handler_", 8) == 0) + else if (strncmp (key, "Handler_", + strlen ("Handler_")) == 0) { if (val == 0ULL) continue; - counter_submit ("mysql_handler", key + 8, val, db); + counter_submit ("mysql_handler", + key + strlen ("Handler_"), + val, db); } - else if (strncmp (key, "Qcache_", 7) == 0) + else if (strncmp (key, "Qcache_", + strlen ("Qcache_")) == 0) { if (strcmp (key, "Qcache_hits") == 0) qcache_hits = val; @@ -698,14 +787,16 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Qcache_queries_in_cache") == 0) qcache_queries_in_cache = (int) val; } - else if (strncmp (key, "Bytes_", 6) == 0) + else if (strncmp (key, "Bytes_", + strlen ("Bytes_")) == 0) { if (strcmp (key, "Bytes_received") == 0) traffic_incoming += val; else if (strcmp (key, "Bytes_sent") == 0) traffic_outgoing += val; } - else if (strncmp (key, "Threads_", 8) == 0) + else if (strncmp (key, "Threads_", + strlen ("Threads_")) == 0) { if (strcmp (key, "Threads_running") == 0) threads_running = (int) val; @@ -716,6 +807,13 @@ static int mysql_read (user_data_t *ud) else if (strcmp (key, "Threads_created") == 0) threads_created = val; } + else if (strncmp (key, "Table_locks_", + strlen ("Table_locks_")) == 0) + { + counter_submit ("mysql_locks", + key + strlen ("Table_locks_"), + val, db); + } } mysql_free_result (res); res = NULL; @@ -735,7 +833,7 @@ static int mysql_read (user_data_t *ud) if (db->master_stats) mysql_read_master_stats (db, con); - if (db->slave_stats) + if ((db->slave_stats) || (db->slave_notif)) mysql_read_slave_stats (db, con); return (0);