Fix munin mysql graph.

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 7264c29974a2e1d9b061a653a098a938c8bd583b..f12bbcf96445493a19eb8618d0e3d28a265b0a86 100644 (file)
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -15,8 +15,11 @@ class nodo::role::mail {
   }
 
   # Graph mysql
-  munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
-    config => "user root",
+  package { 'libcache-cache-perl':  # needed by munin mysql plugin
+    ensure => present,
+  }
+  munin::plugin { [ 'mysql_', 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+    config => 'user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf',
     ensure => $virtual ? {
        true     => present,
        default  => absent,

diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index c4aa89012bfae076565edb03a1d9f184ec431150..b01cb001daa33ac8341f9e2e6c0f63855c53cdfe 100644 (file)
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -10,9 +10,12 @@ class nodo::role::web inherits nodo::base::vserver {
     ensure => present,
   }
 
-  munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+  package { 'libcache-cache-perl':  # needed by munin mysql plugin
     ensure => present,
-    config => "user root",
+  }
+  munin::plugin { [ 'mysql_', 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+    ensure => present,
+    config => 'user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf',
   }
 
   # Classes for web nodes