Switch to public overpass instance

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

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index 5ef61b82597f4efabd4904c65a19e77787575905..aad3a7683d2f5833c0ce0bacb5c898bd69016282 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: mysql
+# Cookbook:: mysql

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,33 +17,72 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"
+include_recipe "prometheus"
+

 package "mysql-server"
 package "mysql-client"
 
 service "mysql" do
   action [:enable, :start]
 package "mysql-server"
 package "mysql-client"
 
 service "mysql" do
   action [:enable, :start]

-  supports :status => true, :restart => true, :reload => true
+  supports :status => true, :restart => true

 end
 
 end
 

-template "/etc/mysql/conf.d/chef.cnf" do
+template "/etc/mysql/mysql.conf.d/zzz-chef.cnf" do

   source "my.cnf.erb"
   owner "root"
   group "root"
   source "my.cnf.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :reload, "service[mysql]"
+  mode "644"
+  notifies :restart, "service[mysql]"
+end
+
+service "apparmor" do
+  action :nothing
+end
+
+template "/etc/apparmor.d/local/usr.sbin.mysqld" do
+  source "apparmor.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[apparmor]"
+  only_if { ::Dir.exist?("/sys/kernel/security/apparmor") }

 end
 
 package "libdbd-mysql-perl"
 package "libcache-cache-perl"
 
 end
 
 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
-).each do |stat|
+%w[
+  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
   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
+
+mysql_password = persistent_token("mysql", "prometheus", "password")
+
+mysql_user "prometheus" do
+  password mysql_password
+  process true
+  repl_client true
+end
+
+prometheus_exporter "mysqld" do
+  port 9104
+  environment "DATA_SOURCE_NAME" => "prometheus:#{mysql_password}@(localhost:3306)/"
+end