From 89ef873f7b1f26e670fb4abc8cadea8e87e76de0 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Fri, 21 Mar 2008 15:54:48 +0000
Subject: rearranged some munin stuff

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1081 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---
 manifests/client.pp |  8 +++++---
 manifests/plugin.pp | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'manifests')

diff --git a/manifests/client.pp b/manifests/client.pp
index 13f3e09..0a65418 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -39,9 +39,6 @@ class munin::client {
 				guest: { include munin::plugins::vserver }
 				default: {
 					include munin::plugins::linux
-					case $virtual {
-						xen0: { include munin::plugins::dom0 }
-					}
 				}
 			}
 		}
@@ -49,6 +46,11 @@ class munin::client {
 			err( "Don't know which munin plugins to install for $kernel" )
 		}
 	}
+	case $virtual {
+        physical: { munin::plugins::physical }
+	    xen0: { include munin::plugins::dom0 }
+        xenu: { include munin::plugins::domU }
+    }
 
 }
 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index e4702c2..81bab27 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -169,10 +169,6 @@ class munin::plugins::gentoo inherits munin::plugins::base {
 class munin::plugins::centos inherits munin::plugins::base {
 }
 
-class munin::plugins::selinux inherits munin::plugins::base {
-    munin::plugin::deploy { "selinuxenforced": }
-}
-
 define munin::plugin::deploy ($source = '', $enabled = 'true') {
     $real_source = $source ? {
         ''  =>  "munin/plugins/$name",
@@ -192,13 +188,17 @@ define munin::plugin::deploy ($source = '', $enabled = 'true') {
     }
 }
 
-class munin::plugins::dom0 inherits munin::plugins::base {
+class munin::plugins::dom0 inherits munin::plugins::physical {
     munin::plugin::deploy { "xen": }
     munin::plugin::deploy { "xen-cpu": }
     munin::plugin::deploy { "xen_memory": }
     munin::plugin::deploy { "xen_vbd": }
 }
 
+class munin::plugins::physical inherits munin::plugins::base {
+     munin::plugin { iostat: }
+}
+
 class munin::plugins::domU inherits munin::plugins::base {
     plugin { if_eth0: ensure => "if_" }
 }
-- 
cgit v1.2.3