X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=21088915471bcb7188870552f5b879990e35ec3e;hb=3c15b0e6fa66db107025ae08d3bbb9824d987a89;hp=df1e7b67c66c12a6535fde52db15e4f1a5a9f237;hpb=bfd449eb7f6aaccdd3a9ccd1b816f551563a1ef6;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index df1e7b67..21088915 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -38,8 +38,6 @@
 #include <mysql/mysql.h>
 #endif
 
-/* TODO: Understand `Select_*' and possibly do that stuff as well.. */
-
 struct mysql_database_s /* {{{ */
 {
 	char *instance;
@@ -690,7 +688,7 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Innodb_buffer_pool_pages_dirty") == 0)
 				gauge_submit ("mysql_bpool_pages", "dirty", val, db);
 			else if (strcmp (key, "Innodb_buffer_pool_pages_flushed") == 0)
-				counter_submit ("mysql_bpool_counters", "flushed", val, db);
+				counter_submit ("mysql_bpool_pages", "flushed", val, db);
 			else if (strcmp (key, "Innodb_buffer_pool_pages_free") == 0)
 				gauge_submit ("mysql_bpool_pages", "free", val, db);
 			else if (strcmp (key, "Innodb_buffer_pool_pages_misc") == 0)
@@ -709,6 +707,10 @@ static int mysql_read (user_data_t *ud)
 				counter_submit ("mysql_bpool_counters", "reads", val, db);
 			else if (strcmp (key, "Innodb_buffer_pool_write_requests") == 0)
 				counter_submit ("mysql_bpool_counters", "write_requests", val, db);
+			else if (strcmp (key, "Innodb_buffer_pool_bytes_data") == 0)
+				gauge_submit ("mysql_bpool_bytes", "data", val, db);
+			else if (strcmp (key, "Innodb_buffer_pool_bytes_dirty") == 0)
+				gauge_submit ("mysql_bpool_bytes", "dirty", val, db);
 
 			/* data */
 			if (strcmp (key, "Innodb_data_fsyncs") == 0)
@@ -718,7 +720,7 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Innodb_data_reads") == 0)
 				counter_submit ("mysql_innodb_data", "reads", val, db);
 			else if (strcmp (key, "Innodb_data_writes") == 0)
-				counter_submit ("mysql_bpool_counters", "writes", val, db);
+				counter_submit ("mysql_innodb_data", "writes", val, db);
 			else if (strcmp (key, "Innodb_data_written") == 0)
 				counter_submit ("mysql_innodb_data", "written", val, db);
 
@@ -728,6 +730,32 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Innodb_dblwr_pages_written") == 0)
 				counter_submit ("mysql_innodb_dblwr", "written", val, db);
 
+			/* log */
+			else if (strcmp (key, "Innodb_log_waits") == 0)
+				counter_submit ("mysql_innodb_log", "waits", val, db);
+			else if (strcmp (key, "Innodb_log_write_requests") == 0)
+				counter_submit ("mysql_innodb_log", "write_requests", val, db);
+			else if (strcmp (key, "Innodb_log_writes") == 0)
+				counter_submit ("mysql_innodb_log", "writes", val, db);
+			else if (strcmp (key, "Innodb_os_log_fsyncs") == 0)
+				counter_submit ("mysql_innodb_log", "fsyncs", val, db);
+			else if (strcmp (key, "Innodb_os_log_written") == 0)
+				counter_submit ("mysql_innodb_log", "written", val, db);
+
+			/* pages */
+			else if (strcmp (key, "Innodb_pages_created") == 0)
+				counter_submit ("mysql_innodb_pages", "created", val, db);
+			else if (strcmp (key, "Innodb_pages_read") == 0)
+				counter_submit ("mysql_innodb_pages", "read", val, db);
+			else if (strcmp (key, "Innodb_pages_written") == 0)
+				counter_submit ("mysql_innodb_pages", "written", val, db);
+
+			/* row lock */
+			else if (strcmp (key, "Innodb_row_lock_time") == 0)
+				counter_submit ("mysql_innodb_row_lock", "time", val, db);
+			else if (strcmp (key, "Innodb_row_lock_waits") == 0)
+				counter_submit ("mysql_innodb_row_lock", "waits", val, db);
+
 			/* rows */
 			else if (strcmp (key, "Innodb_rows_deleted") == 0)
 				counter_submit ("mysql_innodb_rows", "deleted", val, db);
@@ -738,6 +766,16 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Innodb_rows_updated") == 0)
 				counter_submit ("mysql_innodb_rows", "updated", val, db);
 		}
+		else if (strncmp (key, "Select_", strlen ("Select_")) == 0)
+		{
+			counter_submit ("mysql_select", key + strlen ("Select_"),
+					val, db);
+		}
+		else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0)
+		{
+			counter_submit ("mysql_sort", key + strlen ("Sort_"),
+					val, db);
+		}
 	}
 	mysql_free_result (res); res = NULL;