diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-11 11:34:03 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-11 11:34:03 -0500 |
| commit | 38d8bd2bdafa5db9e6fc064a86e388958c1c70d9 (patch) | |
| tree | f34279ce00d38998277526eb43596547badf67bb | |
| parent | de4c9b3e46a21a37a1081278c68cdf7680c9d15a (diff) | |
manage mysql munin plugin per-OS, use debian.cnf on Debian
| -rw-r--r-- | manifests/server.pp | 5 | ||||
| -rw-r--r-- | manifests/server/munin/debian.pp | 9 | ||||
| -rw-r--r-- | manifests/server/munin/default.pp (renamed from manifests/munin.pp) | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index d3916a7..49ef9eb 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -11,7 +11,10 @@ class mysql::server { } if $use_munin { - include mysql::munin + case $operatingsystem { + debian: { include mysql::server::munin::debian } + default: { include mysql::server::munin::default } + } } if $use_shorewall { diff --git a/manifests/server/munin/debian.pp b/manifests/server/munin/debian.pp new file mode 100644 index 0000000..2b2acb4 --- /dev/null +++ b/manifests/server/munin/debian.pp @@ -0,0 +1,9 @@ +# manifests/server/munin/debian.pp + +class mysql::server::munin::debian { + munin::plugin { + [mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads]: + config => "user root\nenv.mysqlopts --defaults-file=/etc/mysql/debian.cnf", + require => Package['mysql'], + } +} diff --git a/manifests/munin.pp b/manifests/server/munin/default.pp index b4f82dd..b60ff0d 100644 --- a/manifests/munin.pp +++ b/manifests/server/munin/default.pp @@ -1,6 +1,6 @@ -# manifests/munin.pp +# manifests/server/munin/default.pp -class mysql::munin { +class mysql::server::munin::default { case $munin_mysql_password { '': { fail("please specify \$munin_mysql_password to enable mysql munin plugin")} } |