Merge remote-tracking branch 'riseup/master'

1 files changed, 9 insertions, 4 deletions

diff --git a/manifests/server/munin/default.pp b/manifests/server/munin/default.pp
index b60ff0d..2660ea0 100644
--- a/manifests/server/munin/default.pp
+++ b/manifests/server/munin/default.pp
@@ -1,6 +1,6 @@
 # manifests/server/munin/default.pp
 
-class mysql::server::munin::default {
+class mysql::server::munin::default inherits mysql::server::munin::base {
     case $munin_mysql_password {
         '': { fail("please specify \$munin_mysql_password to enable mysql munin plugin")}
     }
@@ -16,8 +16,13 @@ class mysql::server::munin::default {
     }
 
     munin::plugin {
-        [mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads]:
-            config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost",
-            require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ]
+      [ mysql_bytes, mysql_queries, mysql_slowqueries, mysql_threads ]:
+        config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost",
+        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'] ];
     }
 }