From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jan 2014 10:28:00 +0000 (+0000)
Subject: Configure the nfs_client and tcp munin plugins
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fb13f19b005623db4d2ae0c1def422e885b048a9?hp=c6737f1aca60955a8081e7e94969a21de73a589f

Configure the nfs_client and tcp munin plugins
---

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 0f6c67d86..6ad33e40a 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -205,7 +205,15 @@ munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
 
-if File.exists?("/proc/net/rpc/nfs")
+if node[:kernel][:modules].include?("nfsv3")
+  munin_plugin "nfs_client"
+else
+  munin_plugin "nfs_client" do
+    action :delete
+  end
+end
+
+if node[:kernel][:modules].include?("nfsv4")
   munin_plugin "nfs4_client"
 else
   munin_plugin "nfs4_client" do
@@ -213,7 +221,7 @@ else
   end
 end
 
-if File.exists?("/proc/net/rpc/nfsd")
+if node[:kernel][:modules].include?("nfsd")
   munin_plugin "nfsd"
   munin_plugin "nfsd4"
 else
@@ -297,6 +305,7 @@ node[:block_device].each do |name,attributes|
 end
 
 munin_plugin "swap"
+munin_plugin "tcp"
 munin_plugin "threads"
 munin_plugin "uptime"
 munin_plugin "users"