X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmysql.c;h=caebdf31f3d0f3e1156398cc9768863f4b4738d5;hb=f763c933f11eeb07d4a159fc711190434439eef4;hp=222c02aa1c0719d56317d2d91c24b1c1c16a4cd8;hpb=418249bad5af0493ba4e08fdaf22fd7e402be6af;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 222c02aa..caebdf31 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -1,6 +1,6 @@ /** * collectd - src/mysql.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2006 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 @@ -44,42 +44,55 @@ static char *user; static char *pass; static char *db = NULL; -#if MYSQL_HAVE_READ -static char init_suceeded = 0; -#endif +/* TODO + * understand `Select_*' and possibly do that stuff as well.. + */ 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 *handler_file = "mysql/mysql_handler-%s.rrd"; +static char *qcache_file = "mysql/mysql_qcache.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", + "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int commands_ds_num = 1; static char *handler_ds_def[] = { - "DS:value:COUNTER:25:0:U", + "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int handler_ds_num = 1; +static char *qcache_ds_def[] = +{ + "DS:hits:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:inserts:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:not_cached:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:lowmem_prunes:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:queries_in_cache:GAUGE:"COLLECTD_HEARTBEAT":0:U", + NULL +}; +static int qcache_ds_num = 5; + static char *threads_ds_def[] = { - "DS:running:GAUGE:25:0:U", - "DS:connected:GAUGE:25:0:U", - "DS:cached:GAUGE:25:0:U", + "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:connected:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:created:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; -static int threads_ds_num = 3; +static int threads_ds_num = 4; static char *traffic_ds_def[] = { - "DS:incoming:COUNTER:25:0:U", - "DS:outgoing:COUNTER:25:0:U", + "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int traffic_ds_num = 2; @@ -100,6 +113,11 @@ static MYSQL *getconnection (void) static MYSQL *con; static int state; + static int wait_for = 0; + static int wait_increase = 60; + + int step; + if (state != 0) { int err; @@ -115,6 +133,19 @@ static MYSQL *getconnection (void) } } + step = atoi (COLLECTD_STEP); + + if (wait_for > 0) + { + wait_for -= step; + 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)); @@ -131,6 +162,8 @@ static MYSQL *getconnection (void) else { state = 1; + wait_for = 0; + wait_increase = 60; return (con); } } /* static MYSQL *getconnection (void) */ @@ -138,16 +171,6 @@ static MYSQL *getconnection (void) 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; } @@ -185,6 +208,12 @@ static void handler_write (char *host, char *inst, char *val) rrd_update_file (host, buf, val, handler_ds_def, handler_ds_num); } +static void qcache_write (char *host, char *inst, char *val) +{ + rrd_update_file (host, qcache_file, val, + qcache_ds_def, qcache_ds_num); +} + static void threads_write (char *host, char *inst, char *val) { rrd_update_file (host, threads_file, val, @@ -240,13 +269,40 @@ static void handler_submit (char *inst, unsigned long long value) plugin_submit ("mysql_handler", inst, buf); } -static void threads_submit (int running, int connected, int cached) +static void qcache_submit (unsigned long long hits, unsigned long long inserts, + unsigned long long not_cached, unsigned long long lowmem_prunes, + int queries_in_cache) +{ + char buf[BUFSIZE]; + int status; + + status = snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%i", + (unsigned int) curtime, hits, inserts, not_cached, + lowmem_prunes, queries_in_cache); + + if (status < 0) + { + syslog (LOG_ERR, "snprintf failed"); + return; + } + else if (status >= BUFSIZE) + { + syslog (LOG_WARNING, "snprintf was truncated"); + return; + } + + plugin_submit ("mysql_qcache", "-", buf); +} + +static void threads_submit (int running, int connected, int cached, + unsigned long long created) { char buf[BUFSIZE]; int status; - status = snprintf (buf, BUFSIZE, "%u:%i:%i:%i", (unsigned int) curtime, - running, connected, cached); + status = snprintf (buf, BUFSIZE, "%u:%i:%i:%i:%llu", + (unsigned int) curtime, + running, connected, cached, created); if (status < 0) { @@ -294,21 +350,28 @@ 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; 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)) @@ -334,19 +397,35 @@ 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); } else if (strncmp (key, "Handler_", 8) == 0) { + if (val == 0ULL) + continue; + handler_submit (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) { if (strcmp (key, "Bytes_received") == 0) @@ -362,11 +441,23 @@ 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); */ @@ -381,9 +472,10 @@ 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); + plugin_register ("mysql_handler", NULL, NULL, handler_write); + plugin_register ("mysql_qcache", NULL, NULL, qcache_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); }