From: Quentin Smith <quentin@mit.edu>
Date: Mon, 6 Jan 2014 07:12:30 +0000 (-0500)
Subject: Remove extraneous munin plugins on hosts
X-Git-Tag: 0.0.18~4
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/commitdiff_plain/997c89a64b50507b6141176baf8482dd594e5318

Remove extraneous munin plugins on hosts
---

diff --git a/debian/changelog b/debian/changelog
index a5d2ebe..cb40c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xvm-munin-config (0.0.18) unstable; urgency=low
   * Add xen_net munin plugin for monitoring network status.
   * Use /etc/sudoers.d now that it exists, instead of appending to
     /etc/sudoers
+  * Remove extraneous munin plugins on hosts
 
- -- Quentin Smith <quentin@mit.edu>  Mon, 06 Jan 2014 02:10:49 -0500
+ -- Quentin Smith <quentin@mit.edu>  Mon, 06 Jan 2014 02:11:37 -0500
 
 xvm-munin-config (0.0.17) unstable; urgency=low
 
diff --git a/debian/xvm-munin-host-config.postinst b/debian/xvm-munin-host-config.postinst
index 890770a..227a982 100755
--- a/debian/xvm-munin-host-config.postinst
+++ b/debian/xvm-munin-host-config.postinst
@@ -26,13 +26,15 @@ case "$1" in
         # Install munin plugins that are now configured
         munin-node-configure --suggest --shell | sh
 
+	# Remove extraneous munin plugins
 	(cd /etc/munin/plugins &&
 	    for i in smart_*; do
 		if smartctl -i "/dev/${i#smart_}" | grep Device | grep EQLOGIC; then
 		    rm -v "$i";
 		fi
 	    done)
-        
+	(shopt -s nullglob; rm -v /etc/munin/plugins/if*_tap* || :)
+
         invoke-rc.d munin-node restart
     ;;