X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=4e72b5bf8989669cafb724ce011cc8b0a28cc2ee;hb=e628f39838a67b40d52dfb8425b4d8474fbd0550;hp=222c02aa1c0719d56317d2d91c24b1c1c16a4cd8;hpb=418249bad5af0493ba4e08fdaf22fd7e402be6af;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 222c02aa..4e72b5bf 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,11 +1,10 @@ /** * collectd - src/mysql.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2006,2007 Florian octo Forster * * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,66 +24,15 @@ #include "plugin.h" #include "configfile.h" -#ifdef HAVE_MYSQL_MYSQL_H +#ifdef HAVE_MYSQL_H +#include +#elif defined(HAVE_MYSQL_MYSQL_H) #include #endif -#define MODULE_NAME "mysql" +/* TODO: Understand `Select_*' and possibly do that stuff as well.. */ -#if COLLECT_LIBMYSQL -# define MYSQL_HAVE_READ 1 -#else -# define MYSQL_HAVE_READ 0 -#endif - -#define BUFSIZE 512 - -static char *host = "localhost"; -static char *user; -static char *pass; -static char *db = NULL; - -#if MYSQL_HAVE_READ -static char init_suceeded = 0; -#endif - -static char *commands_file = "mysql/mysql_commands-%s.rrd"; -static char *handler_file = "mysql/mysql_handler-%s.rrd"; -static char *threads_file = "mysql/mysql_threads.rrd"; -static char *traffic_file = "traffic-mysql.rrd"; - -static char *commands_ds_def[] = -{ - "DS:value:COUNTER:25:0:U", - NULL -}; -static int commands_ds_num = 1; - -static char *handler_ds_def[] = -{ - "DS:value:COUNTER:25:0:U", - NULL -}; -static int handler_ds_num = 1; - -static char *threads_ds_def[] = -{ - "DS:running:GAUGE:25:0:U", - "DS:connected:GAUGE:25:0:U", - "DS:cached:GAUGE:25:0:U", - NULL -}; -static int threads_ds_num = 3; - -static char *traffic_ds_def[] = -{ - "DS:incoming:COUNTER:25:0:U", - "DS:outgoing:COUNTER:25:0:U", - NULL -}; -static int traffic_ds_num = 2; - -static char *config_keys[] = +static const char *config_keys[] = { "Host", "User", @@ -94,18 +42,25 @@ static char *config_keys[] = }; static int config_keys_num = 4; -#if MYSQL_HAVE_READ +static char *host = "localhost"; +static char *user; +static char *pass; +static char *db = NULL; + static MYSQL *getconnection (void) { static MYSQL *con; static int state; + static int wait_for = 0; + static int wait_increase = 60; + if (state != 0) { int err; if ((err = mysql_ping (con)) != 0) { - syslog (LOG_WARNING, "mysql_ping failed: %s", mysql_error (con)); + WARNING ("mysql_ping failed: %s", mysql_error (con)); state = 0; } else @@ -115,43 +70,40 @@ static MYSQL *getconnection (void) } } + if (wait_for > 0) + { + wait_for -= interval_g; + return (NULL); + } + + wait_for = wait_increase; + wait_increase *= 2; + if (wait_increase > 86400) + wait_increase = 86400; + if ((con = mysql_init (con)) == NULL) { - syslog (LOG_ERR, "mysql_init failed: %s", mysql_error (con)); + ERROR ("mysql_init failed: %s", mysql_error (con)); state = 0; return (NULL); } if (mysql_real_connect (con, host, user, pass, db, 0, NULL, 0) == NULL) { - syslog (LOG_ERR, "mysql_real_connect failed: %s", mysql_error (con)); + ERROR ("mysql_real_connect failed: %s", mysql_error (con)); state = 0; return (NULL); } else { state = 1; + wait_for = 0; + wait_increase = 60; return (con); } } /* static MYSQL *getconnection (void) */ -#endif /* MYSQL_HAVE_READ */ -static void init (void) -{ -#if MYSQL_HAVE_READ - if (getconnection () != NULL) - init_suceeded = 1; - else - { - syslog (LOG_ERR, "The `mysql' plugin will be disabled because `init' failed to connect to `%s'", host); - init_suceeded = 0; - } -#endif /* MYSQL_HAVE_READ */ - - return; -} - -static int config (char *key, char *value) +static int config (const char *key, const char *value) { if (strcasecmp (key, "host") == 0) return ((host = strdup (value)) == NULL ? 1 : 0); @@ -165,127 +117,88 @@ static int config (char *key, char *value) return (-1); } -static void commands_write (char *host, char *inst, char *val) +static void counter_submit (const char *type, const char *type_instance, + counter_t value) { - char buf[BUFSIZE]; + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - if (snprintf (buf, BUFSIZE, commands_file, inst) >= BUFSIZE) - return; + values[0].counter = value; - rrd_update_file (host, buf, val, commands_ds_def, commands_ds_num); -} - -static void handler_write (char *host, char *inst, char *val) -{ - char buf[BUFSIZE]; + vl.values = values; + vl.values_len = 1; + vl.time = time (NULL); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - if (snprintf (buf, BUFSIZE, handler_file, inst) >= BUFSIZE) - return; + plugin_dispatch_values (&vl); +} /* void counter_submit */ - rrd_update_file (host, buf, val, handler_ds_def, handler_ds_num); -} - -static void threads_write (char *host, char *inst, char *val) +static void qcache_submit (counter_t hits, counter_t inserts, + counter_t not_cached, counter_t lowmem_prunes, + gauge_t queries_in_cache) { - rrd_update_file (host, threads_file, val, - threads_ds_def, threads_ds_num); -} - -static void traffic_write (char *host, char *inst, char *val) -{ - rrd_update_file (host, traffic_file, val, - traffic_ds_def, traffic_ds_num); -} - -#if MYSQL_HAVE_READ -static void commands_submit (char *inst, unsigned long long value) + value_t values[5]; + value_list_t vl = VALUE_LIST_INIT; + + values[0].counter = hits; + values[1].counter = inserts; + values[2].counter = not_cached; + values[3].counter = lowmem_prunes; + values[4].gauge = queries_in_cache; + + vl.values = values; + vl.values_len = 5; + vl.time = time (NULL); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type)); + + plugin_dispatch_values (&vl); +} /* void qcache_submit */ + +static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached, + counter_t created) { - char buf[BUFSIZE]; - int status; + value_t values[4]; + value_list_t vl = VALUE_LIST_INIT; - status = snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, value); - - if (status < 0) - { - syslog (LOG_ERR, "snprintf failed"); - return; - } - else if (status >= BUFSIZE) - { - syslog (LOG_WARNING, "snprintf was truncated"); - return; - } - - plugin_submit ("mysql_commands", inst, buf); -} - -static void handler_submit (char *inst, unsigned long long value) -{ - char buf[BUFSIZE]; - int status; + values[0].gauge = running; + values[1].gauge = connected; + values[2].gauge = cached; + values[3].counter = created; - status = snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, value); - - if (status < 0) - { - syslog (LOG_ERR, "snprintf failed"); - return; - } - else if (status >= BUFSIZE) - { - syslog (LOG_WARNING, "snprintf was truncated"); - return; - } - - plugin_submit ("mysql_handler", inst, buf); -} - -static void threads_submit (int running, int connected, int cached) -{ - char buf[BUFSIZE]; - int status; - - status = snprintf (buf, BUFSIZE, "%u:%i:%i:%i", (unsigned int) curtime, - running, connected, cached); - - if (status < 0) - { - syslog (LOG_ERR, "snprintf failed"); - return; - } - else if (status >= BUFSIZE) - { - syslog (LOG_WARNING, "snprintf was truncated"); - return; - } + vl.values = values; + vl.values_len = 4; + vl.time = time (NULL); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + sstrncpy (vl.type, "mysql_threads", sizeof (vl.type)); - plugin_submit ("mysql_threads", "-", buf); -} + plugin_dispatch_values (&vl); +} /* void threads_submit */ -static void traffic_submit (unsigned long long incoming, - unsigned long long outgoing) +static void traffic_submit (counter_t rx, counter_t tx) { - char buf[BUFSIZE]; - int status; + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; - status = snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime, - incoming, outgoing); + values[0].counter = rx; + values[1].counter = tx; - if (status < 0) - { - syslog (LOG_ERR, "snprintf failed"); - return; - } - else if (status >= BUFSIZE) - { - syslog (LOG_WARNING, "snprintf was truncated"); - return; - } + vl.values = values; + vl.values_len = 2; + vl.time = time (NULL); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin)); + sstrncpy (vl.type, "mysql_octets", sizeof (vl.type)); - plugin_submit ("mysql_traffic", "-", buf); -} + plugin_dispatch_values (&vl); +} /* void traffic_submit */ -static void mysql_read (void) +static int mysql_read (void) { MYSQL *con; MYSQL_RES *res; @@ -294,35 +207,42 @@ static void mysql_read (void) int query_len; int field_num; + unsigned long long qcache_hits = 0ULL; + unsigned long long qcache_inserts = 0ULL; + unsigned long long qcache_not_cached = 0ULL; + unsigned long long qcache_lowmem_prunes = 0ULL; + int qcache_queries_in_cache = -1; + int threads_running = -1; int threads_connected = -1; int threads_cached = -1; + unsigned long long threads_created = 0ULL; - unsigned long long traffic_incoming = 0LL; - unsigned long long traffic_outgoing = 0LL; - - if (init_suceeded == 0) - return; + unsigned long long traffic_incoming = 0ULL; + unsigned long long traffic_outgoing = 0ULL; /* An error message will have been printed in this case */ if ((con = getconnection ()) == NULL) - return; + return (-1); query = "SHOW STATUS"; + if (mysql_get_server_version (con) >= 50002) + query = "SHOW GLOBAL STATUS"; + query_len = strlen (query); if (mysql_real_query (con, query, query_len)) { - syslog (LOG_ERR, "mysql_real_query failed: %s\n", + ERROR ("mysql_real_query failed: %s\n", mysql_error (con)); - return; + return (-1); } if ((res = mysql_store_result (con)) == NULL) { - syslog (LOG_ERR, "mysql_store_result failed: %s\n", + ERROR ("mysql_store_result failed: %s\n", mysql_error (con)); - return; + return (-1); } field_num = mysql_num_fields (res); @@ -334,18 +254,34 @@ static void mysql_read (void) key = row[0]; val = atoll (row[1]); - if (val == 0ULL) - continue; - if (strncmp (key, "Com_", 4) == 0) { + if (val == 0ULL) + continue; + /* Ignore `prepared statements' */ if (strncmp (key, "Com_stmt_", 9) != 0) - commands_submit (key + 4, val); + counter_submit ("mysql_commands", key + 4, val); } else if (strncmp (key, "Handler_", 8) == 0) { - handler_submit (key + 8, val); + if (val == 0ULL) + continue; + + counter_submit ("mysql_handler", key + 8, val); + } + else if (strncmp (key, "Qcache_", 7) == 0) + { + if (strcmp (key, "Qcache_hits") == 0) + qcache_hits = val; + else if (strcmp (key, "Qcache_inserts") == 0) + qcache_inserts = val; + else if (strcmp (key, "Qcache_not_cached") == 0) + qcache_not_cached = val; + else if (strcmp (key, "Qcache_lowmem_prunes") == 0) + qcache_lowmem_prunes = val; + else if (strcmp (key, "Qcache_queries_in_cache") == 0) + qcache_queries_in_cache = (int) val; } else if (strncmp (key, "Bytes_", 6) == 0) { @@ -362,30 +298,32 @@ static void mysql_read (void) threads_connected = (int) val; else if (strcmp (key, "Threads_cached") == 0) threads_cached = (int) val; + else if (strcmp (key, "Threads_created") == 0) + threads_created = val; } } mysql_free_result (res); res = NULL; - threads_submit (threads_running, threads_connected, threads_cached); + if ((qcache_hits != 0ULL) + || (qcache_inserts != 0ULL) + || (qcache_not_cached != 0ULL) + || (qcache_lowmem_prunes != 0ULL)) + qcache_submit (qcache_hits, qcache_inserts, qcache_not_cached, + qcache_lowmem_prunes, qcache_queries_in_cache); + + if (threads_created != 0ULL) + threads_submit (threads_running, threads_connected, + threads_cached, threads_created); + traffic_submit (traffic_incoming, traffic_outgoing); /* mysql_close (con); */ - return; -} -#else -# define mysql_read NULL -#endif /* MYSQL_HAVE_READ */ + return (0); +} /* int mysql_read */ void module_register (void) { - plugin_register (MODULE_NAME, init, mysql_read, NULL); - plugin_register ("mysql_commands", NULL, NULL, commands_write); - plugin_register ("mysql_handler", NULL, NULL, handler_write); - plugin_register ("mysql_threads", NULL, NULL, threads_write); - plugin_register ("mysql_traffic", NULL, NULL, traffic_write); - cf_register (MODULE_NAME, config, config_keys, config_keys_num); -} - -#undef BUFSIZE -#undef MODULE_NAME + plugin_register_config ("mysql", config, config_keys, config_keys_num); + plugin_register_read ("mysql", mysql_read); +} /* void module_register */