Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index ffe699d85638a573012f2fb683741c251bf33d05..aad3a7683d2f5833c0ce0bacb5c898bd69016282 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: mysql
+# Cookbook:: mysql
 # 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.
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+include_recipe "prometheus"
+
 package "mysql-server"
 package "mysql-client"
 
@@ -25,20 +28,27 @@ service "mysql" do
   supports :status => true, :restart => true
 end
 
-conf_file = if node[:lsb][:release].to_f >= 16.04
-              "/etc/mysql/mysql.conf.d/zzz-chef.cnf"
-            else
-              "/etc/mysql/conf.d/zzz-chef.cnf"
-            end
-
-template conf_file do
+template "/etc/mysql/mysql.conf.d/zzz-chef.cnf" do
   source "my.cnf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  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"
 
@@ -63,3 +73,16 @@ end
     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