Add a systemd-resolved FallbackDNS list

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

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 39085f0e2f8efc32a400440a05457fad4662ef7f..cf2b767ab438e3df8b5ad4a44759c1373fe1e60b 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: munin
+# Cookbook:: munin

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,16 +20,11 @@
 package "munin-node"
 
 service "munin-node" do
 package "munin-node"
 
 service "munin-node" do

-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-  elsif node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 

-servers = search(:node, "recipes:munin\\:\\:server") # ~FC010
+servers = search(:node, "recipes:munin\\:\\:server")

 
 servers.each do |server|
   server.interfaces(:role => :external) do |interface|
 
 servers.each do |server|
   server.interfaces(:role => :external) do |interface|


@@ -103,6 +98,10 @@ end
 munin_plugin "df"
 munin_plugin "df_inode"
 
 munin_plugin "df"
 munin_plugin "df_inode"
 

+munin_plugin_conf "diskstats" do
+  template "diskstats.erb"
+end
+

 munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"


@@ -148,7 +147,7 @@ else
   end
 end
 
   end
 end
 

-munin_plugin "hpasmcli_temp" do # ~FC005
+munin_plugin "hpasmcli_temp" do

   action :delete
 end
 
   action :delete
 end
 


@@ -161,7 +160,7 @@ munin_plugin "http_loadtime" do
 end
 
 node[:network][:interfaces].each do |ifname, ifattr|
 end
 
 node[:network][:interfaces].each do |ifname, ifattr|

-  if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
+  if ifattr[:flags]&.include?("UP") && !ifattr[:flags].include?("LOOPBACK")

     if node[:hardware] &&
        node[:hardware][:network] &&
        node[:hardware][:network][ifname][:device] =~ /^virtio/
     if node[:hardware] &&
        node[:hardware][:network] &&
        node[:hardware][:network][ifname][:device] =~ /^virtio/


@@ -212,7 +211,6 @@ if Dir.glob("/dev/ipmi*").empty?
 
   munin_plugin "ipmi_power" do
     action :delete
 
   munin_plugin "ipmi_power" do
     action :delete

-    only_if { node[:lsb][:release].to_f >= 14.04 }

   end
 else
   munin_plugin_conf "ipmi" do
   end
 else
   munin_plugin_conf "ipmi" do


@@ -229,7 +227,6 @@ else
 
   munin_plugin "ipmi_power" do
     target "ipmi_"
 
   munin_plugin "ipmi_power" do
     target "ipmi_"

-    only_if { node[:lsb][:release].to_f >= 14.04 }

   end
 end
 
   end
 end