diff options
| -rw-r--r-- | README | 40 | ||||
| -rw-r--r-- | files/scripts/optimize_tables.rb | 3 | ||||
| -rw-r--r-- | manifests/conf.pp | 37 | ||||
| -rw-r--r-- | manifests/server.pp | 5 | ||||
| -rw-r--r-- | manifests/server/base.pp | 14 | ||||
| -rw-r--r-- | manifests/server/cron/optimize.pp | 12 | ||||
| -rw-r--r-- | manifests/server/munin/debian.pp | 56 | ||||
| -rw-r--r-- | templates/conf.erb | 9 |
8 files changed, 136 insertions, 40 deletions
@@ -53,6 +53,36 @@ grant tables. The my.cnf file will installed from one of many possible places, see manifests/server/base.pp for possible locations for managing this. +Configuration snippets +---------------------- + +To make managing mysql configuration easier, you can use the define +mysql::conf. Note, though that there currently is only the Debian default +configuration file that includes files in /etc/mysql/conf.d/. + +For example: + +mysql::conf { 'test': + ensure => present, + section => 'mysqld', + config => { + table_cache => '15000', + skip_slave => '', + something => '""', + } +} + +The above example shows two possibilities for empty values. + + * If a value only has an empty value in the hash passed to the config + parameter, that will define a boolean option in mysql by simply mentioning + the option name with no equal sign. So in the above, you'd have a line that + contains only "skip_slave". + + * If you need to declare a variable with an empty value (e.g. with the equal + sign), you can use two quotes as the option's value. In the above example, + you'd have a line that looks like "something=". + Backups ------- @@ -68,6 +98,16 @@ Optimizing tables If you wish mysql to periodically optimize tables, set the "$mysql_optimize_cron = true" variable before you include mysql::server. +By default, time of execution for the optimization script will be randomly +chosen (and will stay consistant for a server) any day between midnight and +7:00 AM. If you wish to force at least one value, you can use the following +parameters to the mysql::server class (all values are used directly as a +cronjob value so they should be set within cron value space): + +* optimize_day => sets the day of the week (integer value) during which the script will run. +* optimize_hour => sets the hour at which the optimization script will run. +* optimize_minute => sets the minute in the hour at which the script will run. + Munin ----- diff --git a/files/scripts/optimize_tables.rb b/files/scripts/optimize_tables.rb index 46e223e..3eb7425 100644 --- a/files/scripts/optimize_tables.rb +++ b/files/scripts/optimize_tables.rb @@ -2,7 +2,8 @@ # set home as we runit as weekly cron, where HOME is / ENV['HOME'] = '/root' -tables = %x{mysql -Bse "SELECT TABLE_SCHEMA,TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND Data_free > 0 AND ENGINE IN ('MyISAM','InnoDB','ARCHIVE')"} +tables = %x(mysql -Bse "SELECT TABLE_SCHEMA,TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND Data_free > 0 AND ENGINE IN ('MyISAM','InnoDB','ARCHIVE')") +tables = tables.split(/\n/) tables.each { |table| tableitems = table.chomp.split(/\t/) system "mysql #{tableitems[0]} -Bse \"OPTIMIZE TABLE \\`#{tableitems[0]}\\`.\\`#{tableitems[1]}\\`\" | grep -q OK" diff --git a/manifests/conf.pp b/manifests/conf.pp new file mode 100644 index 0000000..f9cbeb3 --- /dev/null +++ b/manifests/conf.pp @@ -0,0 +1,37 @@ +# $config needs to be a hash of key => value pairs. +# +# values in config are output as key = value, except when the value is empty; +# then just key is output. if you need to output an empty value in the form +# key = value, then you can specify empty quotes as the value (see example). +# +# mysql::conf { 'test': +# ensure => present, +# section => 'mysqld', +# config => { +# table_cache => '15000', +# skip_slave => '', +# something => '""', +# } +# } +# +# This will generate the following contents: +# [mysqld] +# skip_slave +# something = "" +# table_cache = 15000 +# +define mysql::conf ( + $section, + $config, + $ensure = present +) { + + include mysql::server::base + + file { "/etc/mysql/conf.d/${name}.cnf": + ensure => $ensure, + content => template('mysql/conf.erb'), + notify => Service['mysql'], + } + +} diff --git a/manifests/server.pp b/manifests/server.pp index a03dd7b..5a34b1c 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -8,6 +8,9 @@ class mysql::server ( $nagios_password_hash = 'absent', $backup_cron = false, $optimize_cron = false, + $optimize_hour = fqdn_rand(7), + $optimize_minute = fqdn_rand(60), + $optimize_day = fqdn_rand(7), $backup_dir = '/var/backups/mysql', $manage_backup_dir = true, $nagios_notcp = false @@ -20,7 +23,7 @@ class mysql::server ( } if $manage_munin and $::mysql_exists == 'true' { - if $munin_password == 'absent' { + if $munin_password == 'absent' and $::operatingsystem != debian { fail('need to set the munin password') } case $::operatingsystem { diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 14f3c1b..7bbf30d 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -70,7 +70,11 @@ class mysql::server::base { } if $mysql::server::optimize_cron { - include mysql::server::cron::optimize + class { 'mysql::server::cron::optimize': + optimize_hour => $mysql::server::optimize_hour, + optimize_minute => $mysql::server::optimize_minute, + optimize_day => $mysql::server::optimize_day, + } } service { 'mysql': @@ -88,4 +92,12 @@ class mysql::server::base { Mysql_user<<| tag == "mysql_${::fqdn}" |>> Mysql_grant<<| tag == "mysql_${::fqdn}" |>> } + + file { '/etc/mysql/conf.d': + ensure => directory, + owner => 'root', + group => 0, + mode => '0755', + } + } diff --git a/manifests/server/cron/optimize.pp b/manifests/server/cron/optimize.pp index d1d0257..5d4fa98 100644 --- a/manifests/server/cron/optimize.pp +++ b/manifests/server/cron/optimize.pp @@ -1,5 +1,9 @@ # optimize mysql databases regurarely -class mysql::server::cron::optimize { +class mysql::server::cron::optimize ( + $optimize_hour, + $optimize_minute, + $optimize_day +) { file { 'mysql_optimize_script': path => '/usr/local/sbin/optimize_mysql_tables.rb', @@ -12,9 +16,9 @@ class mysql::server::cron::optimize { cron { 'mysql_optimize_cron': command => '/usr/local/sbin/optimize_mysql_tables.rb', user => 'root', - minute => 40, - hour => 6, - weekday => 7, + minute => $optimize_minute, + hour => $optimize_hour, + weekday => $optimize_day, require => [ Exec['mysql_set_rootpw'], File['mysql_root_cnf'], File['mysql_optimize_script'] ], diff --git a/manifests/server/munin/debian.pp b/manifests/server/munin/debian.pp index 9ff7863..c7ae961 100644 --- a/manifests/server/munin/debian.pp +++ b/manifests/server/munin/debian.pp @@ -1,35 +1,25 @@ # debian way of calling plugins -class mysql::server::munin::debian inherits mysql::server::munin::default { - Munin::Plugin['mysql_bytes']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin['mysql_queries']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin['mysql_slowqueries']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin['mysql_threads']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin::Deploy['mysql_connections']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin::Deploy['mysql_qcache']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin::Deploy['mysql_cache_mem']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } - Munin::Plugin::Deploy['mysql_size_all']{ - config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", - require => Package['mysql'], - } +class mysql::server::munin::debian { + + munin::plugin { + [mysql_queries, mysql_slowqueries, mysql_bytes, mysql_threads]: + config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", + } + + munin::plugin::deploy{ + 'mysql_connections': + source => 'mysql/munin/mysql_connections'; + 'mysql_qcache': + source => 'mysql/munin/mysql_qcache'; + 'mysql_qcache_mem': + source => 'mysql/munin/mysql_qcache_mem'; + 'mysql_size_all': + source => 'mysql/munin/mysql_size_all'; + } + + Munin::Plugin::Deploy[ [ 'mysql_connections', 'mysql_qcache', 'mysql_qcache_mem', 'mysql_size_all' ] ] { + config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", + require => Package['mysql'], + } + } diff --git a/templates/conf.erb b/templates/conf.erb new file mode 100644 index 0000000..c7e332a --- /dev/null +++ b/templates/conf.erb @@ -0,0 +1,9 @@ +# THIS FILE IS MANAGED BY PUPPET +[<%= @section -%>] +<% @config.each do |key, value| -%> +<% if value != '' -%> +<%= key -%> = <%= value %> +<% else -%> +<%= key %> +<% end -%> +<% end %> |