From edf55dda28e3642fd9fc849bcfd91f09e3844161 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 19 Jul 2008 15:12:10 +0000
Subject: factored out squid munin plugin, cleaned up some whitespaces in xen
 plugin

---
 files/plugins/xen_traffic_all | 12 ++++++------
 manifests/plugin.pp           |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/files/plugins/xen_traffic_all b/files/plugins/xen_traffic_all
index 3fcb508..1e9b06e 100644
--- a/files/plugins/xen_traffic_all
+++ b/files/plugins/xen_traffic_all
@@ -43,17 +43,17 @@ if [ "$1" = "config" ]; then
                 name=$real_name"_"`echo $dev | sed 's/\./\_/'`
             fi
             #echo $name"UP.label $name"
-	    #echo $name"DOWN.label $name"
+	        #echo $name"DOWN.label $name"
         
             echo $name'Down.label received'
-	    echo $name'Down.type COUNTER'
+	        echo $name'Down.type COUNTER'
             echo $name'Down.graph no'
-	    echo "${name}Down.cdef ${name}Down,8,*"
+	        echo "${name}Down.cdef ${name}Down,8,*"
             echo "${name}Up.label ${name}"
-	    echo $name'Up.type COUNTER'
+	        echo $name'Up.type COUNTER'
             echo "${name}Up.negative ${name}Down"
-	    echo "${name}Up.cdef ${name}Up,8,*"
-	done
+	        echo "${name}Up.cdef ${name}Up,8,*"
+	    done
     done
     exit 0
 fi
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 9111aec..2065c79 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -246,13 +246,6 @@ class munin::plugins::selinux inherits munin::plugins::base {
     munin::plugin::deploy { "selinux_avcstats": }
 }
 
-class munin::plugins::squid inherits munin::plugins::base {
-    munin::plugin{ 'squid_cache': config => "user root\nenv.squidhost localhost\nenv.squidport 80"}
-    munin::plugin{ 'squid_icp': }
-    munin::plugin{ 'squid_requests': }
-    munin::plugin{ 'squid_traffic': }
-}
-
 class munin::plugins::postgres inherits munin::plugins::base {
     munin::plugin::deploy { "pg_conn": }
     munin::plugin::deploy { "pg__connections": ensure => 'absent' }
-- 
cgit v1.2.3