mysql plugin: Add `lock' statistics.

Hi,

We evaluate collectd for internal use in our global monitoring system. For that
we need to monitor mysql locks, so as collectd doesn't do this I wrote a little
patch. This patch is based on 4.6.2 version and modify only src/mysql.c, hope
you'll find it usefull. If this patch is acceptable please feel free to
integrate it in your next release.

Regards,

--
Rodolphe Quiedeville
www.bearstech.com

diff --git a/src/mysql.c b/src/mysql.c
index ca5c525dcd8d1b0c2c47def7ef0fa6a1120d05ac..ca364b6c5f2fc67af4c24dcd265cf5c1c6ef4074 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -4,6 +4,7 @@
  * 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
@@ -23,6 +24,7 @@
  *   Mirko Buffoni <briareos at eswat.org>
  *   Doug MacEachern <dougm at hyperic.com>
  *   Sebastian tokkee Harl <sh at tokkee.org>
+ *   Rodolphe Quiédevillel <rquiedeville at bearstech.com>
  **/
 
 #include "collectd.h"
@@ -792,6 +794,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_", 12) == 0)
+               {
+                       if (val == 0ULL)
+                               continue;
+
+                       counter_submit ("mysql_locks", key + 12, val, db);
+               }
        }
        mysql_free_result (res); res = NULL;
 

diff --git a/src/types.db b/src/types.db
index e07329c2df9b1a6191f341436991b99766773ba2..f8b2f81f2e9b2b422910bde96ff6e4bcda8b6d0b 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -70,6 +70,7 @@ memory                        value:GAUGE:0:281474976710656
 multimeter             value:GAUGE:U:U
 mysql_commands         value:COUNTER:0:U
 mysql_handler          value:COUNTER:0:U
+mysql_locks            value:COUNTER:0:U
 mysql_log_position     value:COUNTER:0:4294967295
 mysql_octets           rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 mysql_qcache           hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U