diff --git a/src/mysql.c b/src/mysql.c
index 1ac62e9809e34077e455cdf85d8c00bd9fdf1ab3..caebdf31f3d0f3e1156398cc9768863f4b4738d5 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
/**
* collectd - src/mysql.c
/**
* 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
*
* 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
#define BUFSIZE 512
#define BUFSIZE 512
-static char *host;
+static char *host = "localhost";
static char *user;
static char *pass;
static char *db = NULL;
static char *user;
static char *pass;
static char *db = NULL;
-static char init_suceeded = 0;
+/* TODO
+ * understand `Select_*' and possibly do that stuff as well..
+ */
-static char *commands_file = "mysql_commands.rrd";
-static char *traffic_file = "mysql_traffic.rrd";
+static char *commands_file = "mysql/mysql_commands-%s.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[] =
{
static char *commands_ds_def[] =
{
- "DS:insert:COUNTER:25:0:U",
- "DS:select:COUNTER:25:0:U",
- "DS:show:COUNTER:25:0:U",
- "DS:update:COUNTER:25:0:U",
- "DS:other:COUNTER:25:0:U",
+ "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U",
NULL
};
NULL
};
-static int commands_ds_num = 5;
+static int commands_ds_num = 1;
+
+static char *handler_ds_def[] =
+{
+ "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:"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 = 4;
static char *traffic_ds_def[] =
{
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;
NULL
};
static int traffic_ds_num = 2;
static MYSQL *con;
static int state;
static MYSQL *con;
static int state;
+ static int wait_for = 0;
+ static int wait_increase = 60;
+
+ int step;
+
if (state != 0)
{
int err;
if (state != 0)
{
int err;
}
}
}
}
+ 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));
if ((con = mysql_init (con)) == NULL)
{
syslog (LOG_ERR, "mysql_init failed: %s", mysql_error (con));
else
{
state = 1;
else
{
state = 1;
+ wait_for = 0;
+ wait_increase = 60;
return (con);
}
} /* static MYSQL *getconnection (void) */
return (con);
}
} /* static MYSQL *getconnection (void) */
static void init (void)
{
static void init (void)
{
-#if MYSQL_HAVE_READ
- if (getconnection () != NULL)
- init_suceeded = 1;
- else
- init_suceeded = 0;
-#endif /* MYSQL_HAVE_READ */
-
return;
}
return;
}
static void commands_write (char *host, char *inst, char *val)
{
static void commands_write (char *host, char *inst, char *val)
{
- rrd_update_file (host, commands_file, val, commands_ds_def, commands_ds_num);
+ char buf[BUFSIZE];
+
+ if (snprintf (buf, BUFSIZE, commands_file, inst) >= BUFSIZE)
+ return;
+
+ 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];
+
+ if (snprintf (buf, BUFSIZE, handler_file, inst) >= BUFSIZE)
+ return;
+
+ 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,
+ threads_ds_def, threads_ds_num);
}
static void traffic_write (char *host, char *inst, char *val)
{
}
static void traffic_write (char *host, char *inst, char *val)
{
- rrd_update_file (host, traffic_file, val, traffic_ds_def, traffic_ds_num);
+ rrd_update_file (host, traffic_file, val,
+ traffic_ds_def, traffic_ds_num);
}
#if MYSQL_HAVE_READ
}
#if MYSQL_HAVE_READ
-static void commands_submit (unsigned long long insert,
- unsigned long long select,
- unsigned long long show,
- unsigned long long update,
- unsigned long long other)
+static void commands_submit (char *inst, unsigned long long value)
{
char buf[BUFSIZE];
int status;
{
char buf[BUFSIZE];
int status;
- status = snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%llu", (unsigned int) curtime,
- insert, select, show, update, other);
+ status = snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, value);
if (status < 0)
{
if (status < 0)
{
return;
}
return;
}
- plugin_submit ("mysql_commands", "-", buf);
+ plugin_submit ("mysql_commands", inst, buf);
+}
+
+static void handler_submit (char *inst, unsigned long long value)
+{
+ char buf[BUFSIZE];
+ int status;
+
+ 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 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:%llu",
+ (unsigned int) curtime,
+ running, connected, cached, created);
+
+ if (status < 0)
+ {
+ syslog (LOG_ERR, "snprintf failed");
+ return;
+ }
+ else if (status >= BUFSIZE)
+ {
+ syslog (LOG_WARNING, "snprintf was truncated");
+ return;
+ }
+
+ plugin_submit ("mysql_threads", "-", buf);
}
static void traffic_submit (unsigned long long incoming,
}
static void traffic_submit (unsigned long long incoming,
int query_len;
int field_num;
int query_len;
int field_num;
- unsigned long long cmd_insert = 0LL;
- unsigned long long cmd_select = 0LL;
- unsigned long long cmd_show = 0LL;
- unsigned long long cmd_update = 0LL;
- unsigned long long cmd_other = 0LL;
+ 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;
- unsigned long long traffic_incoming = 0LL;
- unsigned long long traffic_outgoing = 0LL;
+ int threads_running = -1;
+ int threads_connected = -1;
+ int threads_cached = -1;
+ unsigned long long threads_created = 0ULL;
- 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";
/* 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))
{
query_len = strlen (query);
if (mysql_real_query (con, query, query_len))
{
- syslog (LOG_ERR, "mysql_real_query failed: %s\n", mysql_error (con));
+ syslog (LOG_ERR, "mysql_real_query failed: %s\n",
+ mysql_error (con));
return;
}
if ((res = mysql_store_result (con)) == NULL)
{
return;
}
if ((res = mysql_store_result (con)) == NULL)
{
- syslog (LOG_ERR, "mysql_store_result failed: %s\n", mysql_error (con));
+ syslog (LOG_ERR, "mysql_store_result failed: %s\n",
+ mysql_error (con));
return;
}
return;
}
if (strncmp (key, "Com_", 4) == 0)
{
if (strncmp (key, "Com_", 4) == 0)
{
- if (strncmp (key, "Com_insert", 10) == 0)
- cmd_insert += val;
- else if (strncmp (key, "Com_select", 10) == 0)
- cmd_select += val;
- else if (strncmp (key, "Com_show", 8) == 0)
- cmd_show += val;
- else if (strncmp (key, "Com_update", 10) == 0)
- cmd_update += val;
- else if (strncmp (key, "Com_stmt_", 9) == 0)
- { /* do nothing */ }
- else
- cmd_other += val;
+ 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)
{
}
else if (strncmp (key, "Bytes_", 6) == 0)
{
- if (strncmp (key, "Bytes_received", 14) == 0)
+ if (strcmp (key, "Bytes_received") == 0)
traffic_incoming += val;
traffic_incoming += val;
- else if (strncmp (key, "Bytes_sent", 10) == 0)
+ else if (strcmp (key, "Bytes_sent") == 0)
traffic_outgoing += val;
}
traffic_outgoing += val;
}
+ else if (strncmp (key, "Threads_", 8) == 0)
+ {
+ if (strcmp (key, "Threads_running") == 0)
+ threads_running = (int) val;
+ else if (strcmp (key, "Threads_connected") == 0)
+ 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;
}
mysql_free_result (res); res = NULL;
- commands_submit (cmd_insert, cmd_select, cmd_show, cmd_update, cmd_other);
+ 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); */
traffic_submit (traffic_incoming, traffic_outgoing);
/* mysql_close (con); */
{
plugin_register (MODULE_NAME, init, mysql_read, NULL);
plugin_register ("mysql_commands", NULL, NULL, commands_write);
{
plugin_register (MODULE_NAME, init, mysql_read, NULL);
plugin_register ("mysql_commands", NULL, NULL, commands_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);
}
cf_register (MODULE_NAME, config, config_keys, config_keys_num);
}