Use ruby 2.3 on Ubuntu 16.04 database servers

[chef.git] / cookbooks / mysql / recipes / default.rb

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index 5ef61b82597f4efabd4904c65a19e77787575905..bda0065798c16761205e6824c3b0a939918f3a1c 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -29,7 +29,7 @@ template "/etc/mysql/conf.d/chef.cnf" do
   source "my.cnf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[mysql]"
 end
 
@@ -37,13 +37,23 @@ package "libdbd-mysql-perl"
 package "libcache-cache-perl"
 
 %w(
-  bin_relay_log commands connections files_tables innodb_bpool
-  innodb_bpool_act innodb_insert_buf innodb_io innodb_io_pend
-  innodb_log innodb_rows innodb_semaphores innodb_tnx myisam_indexes
-  network_traffic qcache qcache_mem replication select_types slow
-  sorts table_locks tmp_tables
+  commands connections files handler_read handler_tmp handler_transaction
+  handler_write innodb_bpool innodb_bpool_act innodb_history_list_length
+  innodb_insert_buf innodb_io innodb_io_pend innodb_log innodb_queries
+  innodb_read_views innodb_rows innodb_semaphores innodb_srv_master_thread
+  innodb_tnx max_mem mrr myisam_indexes network_traffic performance
+  qcache qcache_mem select_types slow sorts table_definitions table_locks
+  tmp_tables
 ).each do |stat|
   munin_plugin "mysql_#{stat}" do
     target "mysql_"
   end
 end
+
+%w(
+  bin_relay_log files_tables replication
+).each do |stat|
+  munin_plugin "mysql_#{stat}" do
+    action :delete
+  end
+end