imagery: fixes for host and https

[chef.git] / cookbooks / munin / recipes / plugins.rb

diff --git a/cookbooks/munin/recipes/plugins.rb b/cookbooks/munin/recipes/plugins.rb
index 8f0eca1f2391fb3cd5a1bbce39a5f21b45d359aa..dde0a55ddc816cab55bb047644995814927b095c 100644 (file)
--- a/cookbooks/munin/recipes/plugins.rb
+++ b/cookbooks/munin/recipes/plugins.rb
@@ -23,10 +23,10 @@ remote_directory "/usr/local/share/munin/plugins" do
   source "plugins"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
   files_owner "root"
   files_group "root"
-  files_mode 0o755
+  files_mode "755"
   purge true
 end
 
@@ -34,10 +34,10 @@ remote_directory "/etc/munin/plugin-conf.d" do
   source "plugin-conf.d"
   owner "root"
   group "munin"
-  mode 0o750
+  mode "750"
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode "644"
   purge false
   notifies :restart, "service[munin-node]"
 end
@@ -117,18 +117,6 @@ else
   end
 end
 
-munin_plugin "hpasmcli_temp" do
-  action :delete
-end
-
-munin_plugin "hpasmcli_fans" do
-  action :delete
-end
-
-munin_plugin "http_loadtime" do
-  action :delete
-end
-
 node[:network][:interfaces].each do |ifname, ifattr|
   if ifattr[:flags]&.include?("UP") && !ifattr[:flags].include?("LOOPBACK")
     if node[:hardware] &&
@@ -205,33 +193,20 @@ munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
 
-if node[:kernel][:modules].include?("nfsv3")
-  munin_plugin "nfs_client"
-else
-  munin_plugin "nfs_client" do
-    action :delete
-  end
+munin_plugin "nfs_client" do
+  action :delete
 end
 
-if node[:kernel][:modules].include?("nfsv4")
-  munin_plugin "nfs4_client"
-else
-  munin_plugin "nfs4_client" do
-    action :delete
-  end
+munin_plugin "nfs4_client" do
+  action :delete
 end
 
-if node[:kernel][:modules].include?("nfsd")
-  munin_plugin "nfsd"
-  munin_plugin "nfsd4"
-else
-  munin_plugin "nfsd" do
-    action :delete
-  end
+munin_plugin "nfsd" do
+  action :delete
+end
 
-  munin_plugin "nfsd4" do
-    action :delete
-  end
+munin_plugin "nfsd4" do
+  action :delete
 end
 
 munin_plugin "open_files"