Added check for `libmysqlclient' to `configure.in'

Added `AC_COLLECTD' for `mysql' plugin
Added `mysql' plugin
Added a warning (notice, actually) message to inform users of `write-only' plugins

diff --git a/configure.in b/configure.in
index 3777f7d..8d90a9e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -347,7 +347,35 @@ AC_DEFINE_UNQUOTED(COLLECT_LM_SENSORS, [$collect_lm_sensors],
        [Wether or not to use sensors library])
 AM_CONDITIONAL(BUILD_WITH_LM_SENSORS, test "x$with_lm_sensors" = "xyes")
 
-
+AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to libmysql.])],
+[
+       if test "x$withval" != "xno" && test "x$withval" != "xyes"
+       then
+               LDFLAGS="$LDFLAGS -L$withval/lib"
+               CPPFLAGS="$CPPFLAGS -I$withval/include"
+               with_libmysql="yes"
+       fi
+],
+[
+       with_libmysql="yes"
+])
+if test "x$with_libmysql" = "xyes"
+then
+       AC_CHECK_LIB(mysqlclient, mysql_init,, [with_libmysql="no (libmysql not found)"])
+fi
+if test "x$with_libmysql" = "xyes"
+then
+       AC_CHECK_HEADERS(mysql/mysql.h,, [with_libmysql="no (mysql/mysql.h not found)"])
+fi
+if test "x$with_libmysql" = "xyes"
+then
+       collect_libmysql=1
+else
+       collect_libmysql=0
+fi
+AC_DEFINE_UNQUOTED(COLLECT_LIBMYSQL, [$collect_libmysql],
+       [Wether or not to use mysql library])
+AM_CONDITIONAL(BUILD_WITH_LIBMYSQL, test "x$with_libmysql" = "xyes")
 
 #
 # Check for enabled/disabled features
@@ -427,6 +455,7 @@ AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
 AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
 AC_COLLECTD([load],      [disable], [module], [system load statistics])
 AC_COLLECTD([memory],    [disable], [module], [memory statistics])
+AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
 AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
 AC_COLLECTD([ping],      [disable], [module], [ping statistics])
 AC_COLLECTD([processes], [disable], [module], [processes statistics])
@@ -663,6 +692,7 @@ Configuration:
     lm_sensors  . . . . $with_lm_sensors
     libstatgrab . . . . $with_libstatgrab
     libkstat  . . . . . $with_kstat
+    libmysql  . . . . . $with_libmysql
 
   Features:
     debug . . . . . . . $enable_debug

diff --git a/src/Makefile.am b/src/Makefile.am
index 9240239..b44f257 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,6 +95,19 @@ collectd_LDADD += "-dlopen" memory.la
 collectd_DEPENDENCIES += memory.la
 endif
 
+if BUILD_MODULE_MYSQL
+pkglib_LTLIBRARIES += mysql.la
+mysql_la_SOURCES = mysql.c mysql.h
+mysql_la_LDFLAGS = -module -avoid-version
+if BUILD_WITH_LIBMYSQL
+mysql_la_LDFLAGS += -lmysqlclient
+endif
+#mysql_la_LIBADD = -lmysqlclient
+mysql_la_CFLAGS  = -Wall -Werror
+collectd_LDADD += "-dlopen" mysql.la
+collectd_DEPENDENCIES += mysql.la
+endif
+
 if BUILD_MODULE_NFS
 pkglib_LTLIBRARIES += nfs.la
 nfs_la_SOURCES = nfs.c nfs.h

diff --git a/src/mysql.c b/src/mysql.c
new file mode 100644 (file)
index 0000000..1ac62e9
--- /dev/null
+++ b/src/mysql.c
@@ -0,0 +1,303 @@
+/**
+ * collectd - src/mysql.c
+ * Copyright (C) 2005  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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <octo at verplant.org>
+ **/
+
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
+#include "configfile.h"
+
+#ifdef HAVE_MYSQL_MYSQL_H
+#include <mysql/mysql.h>
+#endif
+
+#define MODULE_NAME "mysql"
+
+#if COLLECT_LIBMYSQL
+# define MYSQL_HAVE_READ 1
+#else
+# define MYSQL_HAVE_READ 0
+#endif
+
+#define BUFSIZE 512
+
+static char *host;
+static char *user;
+static char *pass;
+static char *db = NULL;
+
+static char  init_suceeded = 0;
+
+static char *commands_file = "mysql_commands.rrd";
+static char *traffic_file  = "mysql_traffic.rrd";
+
+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",
+       NULL
+};
+static int commands_ds_num = 5;
+
+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[] =
+{
+       "Host",
+       "User",
+       "Password",
+       "Database",
+       NULL
+};
+static int config_keys_num = 4;
+
+#if MYSQL_HAVE_READ
+static MYSQL *getconnection (void)
+{
+       static MYSQL *con;
+       static int    state;
+
+       if (state != 0)
+       {
+               int err;
+               if ((err = mysql_ping (con)) != 0)
+               {
+                       syslog (LOG_WARNING, "mysql_ping failed: %s", mysql_error (con));
+                       state = 0;
+               }
+               else
+               {
+                       state = 1;
+                       return (con);
+               }
+       }
+
+       if ((con = mysql_init (con)) == NULL)
+       {
+               syslog (LOG_ERR, "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));
+               state = 0;
+               return (NULL);
+       }
+       else
+       {
+               state = 1;
+               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
+               init_suceeded = 0;
+#endif /* MYSQL_HAVE_READ */
+
+       return;
+}
+
+static int config (char *key, char *value)
+{
+       if (strcasecmp (key, "host") == 0)
+               return ((host = strdup (value)) == NULL ? 1 : 0);
+       else if (strcasecmp (key, "user") == 0)
+               return ((user = strdup (value)) == NULL ? 1 : 0);
+       else if (strcasecmp (key, "password") == 0)
+               return ((pass = strdup (value)) == NULL ? 1 : 0);
+       else if (strcasecmp (key, "database") == 0)
+               return ((db = strdup (value)) == NULL ? 1 : 0);
+       else
+               return (-1);
+}
+
+static void commands_write (char *host, char *inst, char *val)
+{
+       rrd_update_file (host, commands_file, val, commands_ds_def, commands_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 (unsigned long long insert,
+               unsigned long long select,
+               unsigned long long show,
+               unsigned long long update,
+               unsigned long long other)
+{
+       char buf[BUFSIZE];
+       int  status;
+
+       status = snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%llu", (unsigned int) curtime,
+                       insert, select, show, update, other);
+
+       if (status < 0)
+       {
+               syslog (LOG_ERR, "snprintf failed");
+               return;
+       }
+       else if (status >= BUFSIZE)
+       {
+               syslog (LOG_WARNING, "snprintf was truncated");
+               return;
+       }
+
+       plugin_submit ("mysql_commands", "-", buf);
+}
+
+static void traffic_submit (unsigned long long incoming,
+               unsigned long long outgoing)
+{
+       char buf[BUFSIZE];
+       int  status;
+
+       status = snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime,
+                       incoming, outgoing);
+
+       if (status < 0)
+       {
+               syslog (LOG_ERR, "snprintf failed");
+               return;
+       }
+       else if (status >= BUFSIZE)
+       {
+               syslog (LOG_WARNING, "snprintf was truncated");
+               return;
+       }
+
+       plugin_submit ("mysql_traffic", "-", buf);
+}
+
+static void mysql_read (void)
+{
+       MYSQL     *con;
+       MYSQL_RES *res;
+       MYSQL_ROW  row;
+       char      *query;
+       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 traffic_incoming = 0LL;
+       unsigned long long traffic_outgoing = 0LL;
+
+       if (init_suceeded == 0)
+               return;
+
+       /* An error message will have been printed in this case */
+       if ((con = getconnection ()) == NULL)
+               return;
+
+       query = "SHOW STATUS";
+       query_len = strlen (query);
+
+       if (mysql_real_query (con, query, query_len))
+       {
+               syslog (LOG_ERR, "mysql_real_query failed: %s\n", mysql_error (con));
+               return;
+       }
+
+       if ((res = mysql_store_result (con)) == NULL)
+       {
+               syslog (LOG_ERR, "mysql_store_result failed: %s\n", mysql_error (con));
+               return;
+       }
+
+       field_num = mysql_num_fields (res);
+       while ((row = mysql_fetch_row (res)))
+       {
+               char *key;
+               unsigned long long val;
+
+               key = row[0];
+               val = atoll (row[1]);
+
+               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;
+               }
+               else if (strncmp (key, "Bytes_", 6) == 0)
+               {
+                       if (strncmp (key, "Bytes_received", 14) == 0)
+                               traffic_incoming += val;
+                       else if (strncmp (key, "Bytes_sent", 10) == 0)
+                               traffic_outgoing += val;
+               }
+       }
+       mysql_free_result (res); res = NULL;
+
+       commands_submit (cmd_insert, cmd_select, cmd_show, cmd_update, cmd_other);
+       traffic_submit  (traffic_incoming, traffic_outgoing);
+
+       /* mysql_close (con); */
+
+       return;
+}
+#else
+# define mysql_read NULL
+#endif /* MYSQL_HAVE_READ */
+
+void module_register (void)
+{
+       plugin_register (MODULE_NAME, init, mysql_read, NULL);
+       plugin_register ("mysql_commands", NULL, NULL, commands_write);
+       plugin_register ("mysql_traffic", NULL, NULL, traffic_write);
+       cf_register (MODULE_NAME, config, config_keys, config_keys_num);
+}
+
+#undef BUFSIZE
+#undef MODULE_NAME

diff --git a/src/plugin.c b/src/plugin.c
index 87668d7..ce4c943 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -289,6 +289,12 @@ void plugin_register (char *type,
        if (plugin_search (type) != NULL)
                return;
 
+#ifdef HAVE_LIBRRD
+       if ((operating_mode == MODE_LOCAL) || (operating_mode == MODE_CLIENT))
+#endif
+               if (read == NULL)
+                       syslog (LOG_NOTICE, "Plugin `%s' doesn't provide a read function.", type);
+
        if ((p = (plugin_t *) malloc (sizeof (plugin_t))) == NULL)
                return;