Merge remote-tracking branch 'shared/master'

Conflicts:
	files/config/my.cnf.Debian
	manifests/server/base.pp
	manifests/server/munin/default.pp
	manifests/server/nagios.pp

5 files changed, 49 insertions, 9 deletions

diff --git a/manifests/client/perl.pp b/manifests/client/perl.pp
new file mode 100644
index 0000000..f11d06f
--- /dev/null
+++ b/manifests/client/perl.pp
@@ -0,0 +1,6 @@
+# mysql perl config
+class mysql::client::perl {
+  case $::operatingsystem {
+    debian: { include mysql::client::perl::debian }
+  }
+}
diff --git a/manifests/client/perl/debian.pp b/manifests/client/perl/debian.pp
new file mode 100644
index 0000000..f4acfb4
--- /dev/null
+++ b/manifests/client/perl/debian.pp
@@ -0,0 +1,6 @@
+# perl package name on debian
+class mysql::client::perl::debian {
+  package { 'libdbd-mysql-perl':
+    ensure => present,
+  }
+}
diff --git a/manifests/server/munin/debian.pp b/manifests/server/munin/debian.pp
index 2b2acb4..9ff7863 100644
--- a/manifests/server/munin/debian.pp
+++ b/manifests/server/munin/debian.pp
@@ -1,9 +1,35 @@
-# 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'],
-    }
+# 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'],
+  }
 }
diff --git a/manifests/server/munin/default.pp b/manifests/server/munin/default.pp
index 83924c5..11609d2 100644
--- a/manifests/server/munin/default.pp
+++ b/manifests/server/munin/default.pp
@@ -31,5 +31,7 @@ class mysql::server::munin::default {
       source => 'mysql/munin/mysql_qcache';
     'mysql_qcache_mem':
       source => 'mysql/munin/mysql_qcache_mem';
+    'mysql_size_all':
+      source => 'mysql/munin/mysql_size_all';
   }
 }
diff --git a/manifests/server/nagios.pp b/manifests/server/nagios.pp
index 0ceb968..39af429 100644
--- a/manifests/server/nagios.pp
+++ b/manifests/server/nagios.pp
@@ -6,7 +6,7 @@ class mysql::server::nagios {
   } else {
     $nagios_mysql_user = 'nagios@%'
     nagios::service::mysql { 'connection-time':
-      check_hostname => $::fqdn,
+      check_host => $::fqdn,
       require => Mysql_grant[$nagios_mysql_user],
     }
   }