From a3ac1c067e22f25b6fa5643873a4a935358561f1 Mon Sep 17 00:00:00 2001
From: mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Thu, 24 Apr 2008 11:05:25 +0000
Subject: fixed munin stuff

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

diff --git a/manifests/client.pp b/manifests/client.pp
index c81e6f4..8181845 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -66,6 +66,7 @@ define munin::register()
 	@@file { "${NODESDIR}/${name}_${munin_port_real}":
 		ensure => present,
 		content => template("munin/defaultclient.erb"),
+        tag => 'munin',
 	}
 }
 
@@ -129,7 +130,7 @@ class munin::client::debian
 	munin::register { $fqdn: }
 
 	# workaround bug in munin_node_configure
-	plugin { "postfix_mailvolume": ensure => absent }
+	munin::plugin { "postfix_mailvolume": ensure => absent }
 }
 
 class munin::client::gentoo 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 6eaa518..161bf88 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -149,7 +149,7 @@ class munin::plugins::interfaces inherits munin::plugins::base {
 
 	$ifs = gsub(split($interfaces, " "), "(.+)", "if_\\1")
 	$if_errs = gsub(split($interfaces, " "), "(.+)", "if_err_\\1")
-	plugin {
+	munin::plugin {
 		$ifs: ensure => "if_";
 		$if_errs: ensure => "if_err_";
 	}
@@ -157,7 +157,7 @@ class munin::plugins::interfaces inherits munin::plugins::base {
 
 class munin::plugins::linux inherits munin::plugins::base {
 
-	plugin {
+	munin::plugin {
 		[ df_abs, forks, memory, processes, cpu, df_inode, irqstats,
 		  netstat, open_files, swap, df, entropy, interrupts, load, open_inodes,
 		  vmstat
-- 
cgit v1.2.3