Install curl on the dev server

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

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index f9d2e2d0330f6ce0e6f6b66317e4fe3a5930cfe2..baeff798e8327d72f41d8ad0250a72ac20d1db1c 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,113 +17,53 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "mysql-server"
-package "mysql-client"
+include_recipe "prometheus"

 
 

-service "mysql" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+mysql_variant = if platform?("ubuntu")
+                  "mysql"
+                else
+                  "mariadb"
+                end
+
+package "#{mysql_variant}-server"
+package "#{mysql_variant}-client"
+
+service "#{mysql_variant}" do
+  action [:enable, :start]
+  supports :status => true, :restart => true

 end
 
 end
 

-template "/etc/mysql/conf.d/chef.cnf" do
+template "/etc/mysql/#{mysql_variant}.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]"
-end
-
-package "libdbd-mysql-perl"
-package "libcache-cache-perl"
-
-munin_plugin "mysql_bin_relay_log" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_commands" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_connections" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_files_tables" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_bpool" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_bpool_act" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_insert_buf" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_io" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_io_pend" do
-  target "mysql_"
+  mode "644"
+  notifies :restart, "service[#{mysql_variant}]"

 end
 
 end
 

-munin_plugin "mysql_innodb_log" do
-  target "mysql_"
+service "apparmor" do
+  action :nothing

 end
 
 end
 

-munin_plugin "mysql_innodb_rows" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_semaphores" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_innodb_tnx" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_myisam_indexes" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_network_traffic" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_qcache" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_qcache_mem" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_replication" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_select_types" do
-  target "mysql_"
-end
-
-munin_plugin "mysql_slow" do
-  target "mysql_"
+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
 
 end
 

-munin_plugin "mysql_sorts" do
-  target "mysql_"
-end
+mysql_password = persistent_token("mysql", "prometheus", "password")

 
 

-munin_plugin "mysql_table_locks" do
-  target "mysql_"
+mysql_user "prometheus" do
+  password mysql_password
+  process true
+  repl_client true

 end
 
 end
 

-munin_plugin "mysql_tmp_tables" do
-  target "mysql_"
+prometheus_exporter "mysqld" do
+  port 9104
+  options "--mysqld.username=prometheus"
+  environment "MYSQLD_EXPORTER_PASSWORD" => mysql_password

 end
 end