fix script_path_in parameter

This commit is contained in:
Micah Anderson 2010-10-26 17:37:36 -04:00
parent 78fa3e62cf
commit f43c0c883a
3 changed files with 22 additions and 16 deletions

View file

@ -3,22 +3,18 @@ class mysql::server::munin::base {
file { file {
"/usr/local/share/munin-plugins/mysql_connections": "/usr/local/share/munin-plugins/mysql_connections":
source => "$fileserver/munin/mysql_connections", source => "$fileserver/munin/mysql_connections",
mode => 0755, owner => root, group => root, mode => 0755, owner => root, group => root;
script_path_in => "/usr/local/share/munin-plugins";
"/usr/local/share/munin-plugins/mysql_qcache": "/usr/local/share/munin-plugins/mysql_qcache":
source => "$fileserver/munin/mysql_qcache", source => "$fileserver/munin/mysql_qcache",
mode => 0755, owner => root, group => root, mode => 0755, owner => root, group => root;
script_path_in => "/usr/local/share/munin-plugins";
"/usr/local/share/munin-plugins/mysql_qcache_mem": "/usr/local/share/munin-plugins/mysql_qcache_mem":
source => "$fileserver/munin/mysql_qcache_mem", source => "$fileserver/munin/mysql_qcache_mem",
mode => 0755, owner => root, group => root, mode => 0755, owner => root, group => root;
script_path_in => "/usr/local/share/munin-plugins";
"/usr/local/share/munin-plugins/mysql_size_all": "/usr/local/share/munin-plugins/mysql_size_all":
source => "$fileserver/munin/mysql_size_all", source => "$fileserver/munin/mysql_size_all",
mode => 0755, owner => root, group => root, mode => 0755, owner => root, group => root;
script_path_in => "/usr/local/share/munin-plugins";
} }
} }

View file

@ -1,9 +1,14 @@
# manifests/server/munin/debian.pp # manifests/server/munin/debian.pp
class mysql::server::munin::debian inherits mysql::server::munin::base { class mysql::server::munin::debian inherits mysql::server::munin::base {
munin::plugin { munin::plugin {
[mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads, mysql_connections, mysql_qcache, mysql_cache_mem, mysql_size_all]: [ mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads ]:
config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf",
require => Package['mysql'], require => Package['mysql'];
}
[ mysql_connections, mysql_qcache, mysql_cache_mem, mysql_size_all ]:
config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf",
script_path_in => "/usr/local/share/munin-plugins";
require => Package['mysql'];
}
} }

View file

@ -16,8 +16,13 @@ class mysql::server::munin::default inherits mysql::server::munin::base {
} }
munin::plugin { munin::plugin {
[mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads, mysql_connections, mysql_qcache, mysql_cache_mem, mysql_size_all]: [ mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads ]:
config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost", config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost",
require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ] require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ];
[ mysql_connections, mysql_qcache, mysql_cache_mem, mysql_size_all ]:
script_path_in => "/usr/local/share/munin-plugins",
config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost",
require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ];
} }
} }