3 files changed, 18 insertions, 3 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 41d8021..4d1960d 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -42,4 +42,8 @@ class puppet::puppetmaster inherits puppet {
   if $use_shorewall {
     include shorewall::rules::puppet::master
   }
+
+  if $use_munin {
+    include puppet::puppetmaster::munin
+  }
 }
diff --git a/manifests/puppetmaster/hasdb/mysql.pp b/manifests/puppetmaster/hasdb/mysql.pp
index 322bf69..1ed122a 100644
--- a/manifests/puppetmaster/hasdb/mysql.pp
+++ b/manifests/puppetmaster/hasdb/mysql.pp
@@ -23,8 +23,10 @@ define puppet::puppetmaster::hasdb::mysql (
     tag => "mysql_${dbhostfqdn}",
   }
 
-  munin::plugin::deploy { 'puppetresources':
-    source => "puppet/munin/puppetresources.mysql",
-    config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
+  if $use_munin {
+    munin::plugin::deploy { 'puppetresources':
+      source => "puppet/munin/puppetresources.mysql",
+      config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
+    }
   }
 }
diff --git a/manifests/puppetmaster/munin.pp b/manifests/puppetmaster/munin.pp
new file mode 100644
index 0000000..4500b74
--- /dev/null
+++ b/manifests/puppetmaster/munin.pp
@@ -0,0 +1,9 @@
+class puppet::puppetmaster::munin {
+
+  munin::plugin::deploy {
+    [ 'puppetmaster_memory', 'puppet_clients' ]:
+      source => "puppet/munin/puppet_",
+      config => "user root"
+  }
+
+}