we now let run a normal squid on 127.0.0.1:3128, so plugins don't need anymore a config. added a new plugin

1 files changed, 5 insertions, 13 deletions

diff --git a/manifests/munin.pp b/manifests/munin.pp
index 2cc44ec..81317fe 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,17 +1,9 @@
 # manifests/munin.pp
 
 class squid::munin {
-    $real_squid_munin_ip = $squid_munin_ip ? {
-        '' => $ipaddress,
-        default => $squid_munin_ip
-    }
-    $real_squid_munin_port = $squid_munin_port ? {
-        '' => 3128,
-        default => $squid_munin_port
-    }
-
-    munin::plugin{ 'squid_cache': config => "user root\nenv.squidhost ${ipaddress}\nenv.squidport ${real_squid_munin_port}"}
-    munin::plugin{ 'squid_icp': config => "user root\nenv.squidhost ${ipaddress}\nenv.squidport ${real_squid_munin_port}"}
-    munin::plugin{ 'squid_requests': config => "user root\nenv.squidhost ${ipaddress}\nenv.squidport ${real_squid_munin_port}"}
-    munin::plugin{ 'squid_traffic': config => "user root\nenv.squidhost ${ipaddress}\nenv.squidport ${real_squid_munin_port}"}
+    munin::plugin{ 'squid_cache': }
+    munin::plugin{ 'squid_icp': }
+    munin::plugin{ 'squid_requests': }
+    munin::plugin{ 'squid_traffic': }
+    munin::remoteplugin{ 'squid_efficiency': source => "puppet://$server/squid/munin/squid_efficiency" }
 }