Split out default munin plugin installation to a new recipe
authorTom Hughes <tom@compton.nu>
Sat, 15 Feb 2020 17:24:57 +0000 (17:24 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 15 Feb 2020 18:25:49 +0000 (18:25 +0000)
Having split them out make sure the default recipe is included
anywhere a munin_plugin resource is used, to ensure that munin
is installed and make coupling explicit.

31 files changed:
.kitchen.yml
.travis.yml
cookbooks/apache/recipes/default.rb
cookbooks/chef/recipes/server.rb
cookbooks/dev/metadata.rb
cookbooks/dev/recipes/default.rb
cookbooks/exim/metadata.rb
cookbooks/exim/recipes/default.rb
cookbooks/fail2ban/recipes/default.rb
cookbooks/hardware/recipes/default.rb
cookbooks/memcached/recipes/default.rb
cookbooks/munin/recipes/default.rb
cookbooks/munin/recipes/plugins.rb [new file with mode: 0644]
cookbooks/munin/resources/plugin.rb
cookbooks/mysql/recipes/default.rb
cookbooks/nginx/recipes/default.rb
cookbooks/nominatim/metadata.rb
cookbooks/nominatim/recipes/default.rb
cookbooks/ntp/recipes/default.rb
cookbooks/passenger/recipes/default.rb
cookbooks/planet/recipes/default.rb
cookbooks/postgresql/metadata.rb
cookbooks/postgresql/recipes/default.rb
cookbooks/squid/recipes/default.rb
cookbooks/tile/metadata.rb
cookbooks/tile/recipes/default.rb
cookbooks/tilecache/metadata.rb
cookbooks/tilecache/recipes/default.rb
cookbooks/web/metadata.rb
cookbooks/web/recipes/rails.rb
roles/base.rb

index 9b9a4c03cd85516739f255aed256a66fbbe4eba8..db9eb968086a61a515780dd4220c7d20a8feb04f 100644 (file)
@@ -94,18 +94,20 @@ suites:
       - recipe[incron::default]
   - name: letsencrypt
     run_list:
-      - role[letsencrypt]
+      - recipe[letsencrypt::default]
     attributes:
       apt:
         sources:
           - openstreetmap
   - name: memcached
     run_list:
-      - recipe[munin::default]
       - recipe[memcached::default]
   - name: munin
     run_list:
       - recipe[munin::default]
+  - name: munin-plugins
+    run_list:
+      - recipe[munin::plugins]
   - name: munin-server
     run_list:
       - recipe[munin::server]
@@ -117,7 +119,6 @@ suites:
       - recipe[networking::default]
   - name: nginx
     run_list:
-      - recipe[munin::default]
       - recipe[nginx::default]
     attributes:
       networking:
index 9387d3348a7ca6d91bb47958abe2fd064b1f05e2..ded49335b2bb91c076f2d7cf2bd7c3c546b44987 100644 (file)
@@ -59,7 +59,10 @@ jobs:
     - name: "Test Kitchen (munin)"
       script:
         - bundle exec kitchen test munin-ubuntu-1804
-    - name: "Test Kitchen (munin-server)"
+    - name: "Test Kitchen (munin::plugins)"
+      script:
+        - bundle exec kitchen test munin-plugins-ubuntu-1804
+    - name: "Test Kitchen (munin::server)"
       script:
         - bundle exec kitchen test munin-server-ubuntu-1804
     - name: "Test Kitchen (mysql)"
index 925dda5ad250cc6ea8a5dabb9f5166da93a9768c..59d45d09d696369f9463c8bb1523a7e3ea1b7667 100644 (file)
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
 include_recipe "ssl"
 
 package %w[
index 5eb30d0b6b5d1417b681eb49c8a307d1011b8de1..f965592a1ae2be759ee572dc94f619be6ef404aa 100644 (file)
@@ -18,6 +18,7 @@
 #
 
 include_recipe "apache"
+include_recipe "munin"
 
 # cache_dir = Chef::Config[:file_cache_path]
 #
index b54b93f1d969544835fd8dc8e09a315e53b2117b..766f3b5c6a95b5fa61bd393b79f21989df6a97f3 100644 (file)
@@ -11,6 +11,7 @@ depends           "passenger"
 depends           "geoipupdate"
 depends           "git"
 depends           "memcached"
+depends           "munin"
 depends           "mysql"
 depends           "nodejs"
 depends           "postgresql"
index d8309f336d2011b6d3d084175bfaa984ce9e622c..693abecf2525a8a8bbf6b82a24f27d5e32d36eb0 100644 (file)
@@ -25,6 +25,7 @@ include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
+include_recipe "munin"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
index 0c083b9916b1b40e1c07902cd3bc10bd1371ddb0..962e483c3fa9d324ba938311e0c6fa747ebcc881 100644 (file)
@@ -8,5 +8,6 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
+depends           "munin"
 depends           "networking"
 depends           "ssl"
index 9aebb3d9f6e7bcef7a7386bed33f4559aa5af7c3..e0fd75de3e84ce9f4f48a38894222aa87d183274 100644 (file)
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
 include_recipe "networking"
 
 package %w[
index 6213a381498f986e5785cf1eed89517d421a8f52..81bb4cd4023bbf6a5f246f75b43d8452c0158917 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "fail2ban"
 
 template "/etc/fail2ban/jail.d/00-default.conf" do
index 6c14fd873e0990f720060ef36641c9efda7f0149..7c7790d47075cf4e549ac483a65f89a8593270a8 100644 (file)
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-include_recipe "tools"
 include_recipe "munin"
+include_recipe "tools"
 
 ohai_plugin "hardware" do
   template "ohai.rb.erb"
index 8c1b427b18806f2b37551cb4e2bc97733785cead..1df2a7eb70944b132f998e73b11a4171012c837b 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "memcached"
 
 service "memcached" do
index cf2b767ab438e3df8b5ad4a44759c1373fe1e60b..70d6f30500f6157bffc6b8ec4be63d250eccab40 100644 (file)
@@ -48,284 +48,3 @@ template "/etc/munin/munin-node.conf" do
   variables :servers => servers
   notifies :restart, "service[munin-node]"
 end
-
-remote_directory "/usr/local/share/munin/plugins" do
-  source "plugins"
-  owner "root"
-  group "root"
-  mode 0o755
-  files_owner "root"
-  files_group "root"
-  files_mode 0o755
-  purge true
-end
-
-remote_directory "/etc/munin/plugin-conf.d" do
-  source "plugin-conf.d"
-  owner "root"
-  group "munin"
-  mode 0o750
-  files_owner "root"
-  files_group "root"
-  files_mode 0o644
-  purge false
-  notifies :restart, "service[munin-node]"
-end
-
-if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
-  munin_plugin "acpi" do
-    action :delete
-  end
-else
-  munin_plugin "acpi"
-end
-
-# apcpdu_
-munin_plugin "cpu"
-
-if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state")
-  munin_plugin "cpuspeed"
-else
-  munin_plugin "cpuspeed" do
-    action :delete
-  end
-end
-
-munin_plugin_conf "df" do
-  template "df.erb"
-end
-
-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"
-
-if node[:kernel][:modules].include?("nf_conntrack")
-  package "conntrack"
-
-  munin_plugin "fw_conntrack"
-  munin_plugin "fw_forwarded_local"
-else
-  munin_plugin "fw_conntrack" do
-    action :delete
-  end
-
-  munin_plugin "fw_forwarded_local" do
-    action :delete
-  end
-end
-
-if File.read("/proc/sys/net/ipv4/ip_forward").chomp == "1"
-  munin_plugin "fw_packets"
-else
-  munin_plugin "fw_packets" do
-    action :delete
-  end
-end
-
-if File.exist?("/sbin/hpasmcli")
-  munin_plugin "hpasmcli2_temp" do
-    target "hpasmcli2_"
-  end
-
-  munin_plugin "hpasmcli2_fans" do
-    target "hpasmcli2_"
-  end
-else
-  munin_plugin "hpasmcli2_temp" do
-    action :delete
-  end
-
-  munin_plugin "hpasmcli2_fans" do
-    action :delete
-  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] &&
-       node[:hardware][:network] &&
-       node[:hardware][:network][ifname][:device] =~ /^virtio/
-      munin_plugin_conf "if_#{ifname}" do
-        template "if.erb"
-        variables :ifname => ifname
-      end
-    else
-      munin_plugin_conf "if_#{ifname}" do
-        action :delete
-      end
-    end
-
-    munin_plugin "if_err_#{ifname}" do
-      target "if_err_"
-    end
-
-    munin_plugin "if_#{ifname}" do
-      target "if_"
-    end
-  else
-    munin_plugin "if_err_#{ifname}" do
-      action :delete
-    end
-
-    munin_plugin "if_#{ifname}" do
-      action :delete
-    end
-  end
-end
-
-munin_plugin "interrupts"
-munin_plugin "iostat"
-munin_plugin "iostat_ios"
-
-if Dir.glob("/dev/ipmi*").empty?
-  munin_plugin_conf "ipmi" do
-    action :delete
-  end
-
-  munin_plugin "ipmi_fans" do
-    action :delete
-  end
-
-  munin_plugin "ipmi_temp" do
-    action :delete
-  end
-
-  munin_plugin "ipmi_power" do
-    action :delete
-  end
-else
-  munin_plugin_conf "ipmi" do
-    template "ipmi.erb"
-  end
-
-  munin_plugin "ipmi_fans" do
-    target "ipmi_"
-  end
-
-  munin_plugin "ipmi_temp" do
-    target "ipmi_"
-  end
-
-  munin_plugin "ipmi_power" do
-    target "ipmi_"
-  end
-end
-
-munin_plugin "irqstats"
-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
-end
-
-if node[:kernel][:modules].include?("nfsv4")
-  munin_plugin "nfs4_client"
-else
-  munin_plugin "nfs4_client" do
-    action :delete
-  end
-end
-
-if node[:kernel][:modules].include?("nfsd")
-  munin_plugin "nfsd"
-  munin_plugin "nfsd4"
-else
-  munin_plugin "nfsd" do
-    action :delete
-  end
-
-  munin_plugin "nfsd4" do
-    action :delete
-  end
-end
-
-munin_plugin "open_files"
-munin_plugin "open_inodes"
-
-munin_plugin "postfix_mailqueue" do
-  action :delete
-end
-
-munin_plugin "postfix_mailvolume" do
-  action :delete
-end
-
-munin_plugin "processes"
-munin_plugin "proc_pri"
-
-sensors_fan = false
-sensors_temp = false
-sensors_volt = false
-
-Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
-  hwmon = "#{hwmon}/device" unless File.exist?("#{hwmon}/name")
-
-  sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty?
-  sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty?
-  sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
-end
-
-package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt
-
-if sensors_fan
-  munin_plugin "sensors_fan" do
-    target "sensors_"
-  end
-else
-  munin_plugin "sensors_fan" do
-    action :delete
-  end
-end
-
-if sensors_temp
-  munin_plugin "sensors_temp" do
-    target "sensors_"
-  end
-else
-  munin_plugin "sensors_temp" do
-    action :delete
-  end
-end
-
-if sensors_volt
-  munin_plugin "sensors_volt" do
-    target "sensors_"
-    conf "sensors_volt.erb"
-  end
-else
-  munin_plugin "sensors_volt" do
-    action :delete
-  end
-end
-
-munin_plugin "swap"
-munin_plugin "tcp"
-munin_plugin "threads"
-munin_plugin "uptime"
-munin_plugin "users"
-munin_plugin "vmstat"
diff --git a/cookbooks/munin/recipes/plugins.rb b/cookbooks/munin/recipes/plugins.rb
new file mode 100644 (file)
index 0000000..8f0eca1
--- /dev/null
@@ -0,0 +1,301 @@
+#
+# Cookbook:: munin
+# Recipe:: default
+#
+# 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
+#
+#     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,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "munin"
+
+remote_directory "/usr/local/share/munin/plugins" do
+  source "plugins"
+  owner "root"
+  group "root"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+  purge true
+end
+
+remote_directory "/etc/munin/plugin-conf.d" do
+  source "plugin-conf.d"
+  owner "root"
+  group "munin"
+  mode 0o750
+  files_owner "root"
+  files_group "root"
+  files_mode 0o644
+  purge false
+  notifies :restart, "service[munin-node]"
+end
+
+if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?
+  munin_plugin "acpi" do
+    action :delete
+  end
+else
+  munin_plugin "acpi"
+end
+
+# apcpdu_
+munin_plugin "cpu"
+
+if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state")
+  munin_plugin "cpuspeed"
+else
+  munin_plugin "cpuspeed" do
+    action :delete
+  end
+end
+
+munin_plugin_conf "df" do
+  template "df.erb"
+end
+
+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"
+
+if node[:kernel][:modules].include?("nf_conntrack")
+  package "conntrack"
+
+  munin_plugin "fw_conntrack"
+  munin_plugin "fw_forwarded_local"
+else
+  munin_plugin "fw_conntrack" do
+    action :delete
+  end
+
+  munin_plugin "fw_forwarded_local" do
+    action :delete
+  end
+end
+
+if File.read("/proc/sys/net/ipv4/ip_forward").chomp == "1"
+  munin_plugin "fw_packets"
+else
+  munin_plugin "fw_packets" do
+    action :delete
+  end
+end
+
+if File.exist?("/sbin/hpasmcli")
+  munin_plugin "hpasmcli2_temp" do
+    target "hpasmcli2_"
+  end
+
+  munin_plugin "hpasmcli2_fans" do
+    target "hpasmcli2_"
+  end
+else
+  munin_plugin "hpasmcli2_temp" do
+    action :delete
+  end
+
+  munin_plugin "hpasmcli2_fans" do
+    action :delete
+  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] &&
+       node[:hardware][:network] &&
+       node[:hardware][:network][ifname][:device] =~ /^virtio/
+      munin_plugin_conf "if_#{ifname}" do
+        template "if.erb"
+        variables :ifname => ifname
+      end
+    else
+      munin_plugin_conf "if_#{ifname}" do
+        action :delete
+      end
+    end
+
+    munin_plugin "if_err_#{ifname}" do
+      target "if_err_"
+    end
+
+    munin_plugin "if_#{ifname}" do
+      target "if_"
+    end
+  else
+    munin_plugin "if_err_#{ifname}" do
+      action :delete
+    end
+
+    munin_plugin "if_#{ifname}" do
+      action :delete
+    end
+  end
+end
+
+munin_plugin "interrupts"
+munin_plugin "iostat"
+munin_plugin "iostat_ios"
+
+if Dir.glob("/dev/ipmi*").empty?
+  munin_plugin_conf "ipmi" do
+    action :delete
+  end
+
+  munin_plugin "ipmi_fans" do
+    action :delete
+  end
+
+  munin_plugin "ipmi_temp" do
+    action :delete
+  end
+
+  munin_plugin "ipmi_power" do
+    action :delete
+  end
+else
+  munin_plugin_conf "ipmi" do
+    template "ipmi.erb"
+  end
+
+  munin_plugin "ipmi_fans" do
+    target "ipmi_"
+  end
+
+  munin_plugin "ipmi_temp" do
+    target "ipmi_"
+  end
+
+  munin_plugin "ipmi_power" do
+    target "ipmi_"
+  end
+end
+
+munin_plugin "irqstats"
+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
+end
+
+if node[:kernel][:modules].include?("nfsv4")
+  munin_plugin "nfs4_client"
+else
+  munin_plugin "nfs4_client" do
+    action :delete
+  end
+end
+
+if node[:kernel][:modules].include?("nfsd")
+  munin_plugin "nfsd"
+  munin_plugin "nfsd4"
+else
+  munin_plugin "nfsd" do
+    action :delete
+  end
+
+  munin_plugin "nfsd4" do
+    action :delete
+  end
+end
+
+munin_plugin "open_files"
+munin_plugin "open_inodes"
+
+munin_plugin "postfix_mailqueue" do
+  action :delete
+end
+
+munin_plugin "postfix_mailvolume" do
+  action :delete
+end
+
+munin_plugin "processes"
+munin_plugin "proc_pri"
+
+sensors_fan = false
+sensors_temp = false
+sensors_volt = false
+
+Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
+  hwmon = "#{hwmon}/device" unless File.exist?("#{hwmon}/name")
+
+  sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty?
+  sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty?
+  sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
+end
+
+package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt
+
+if sensors_fan
+  munin_plugin "sensors_fan" do
+    target "sensors_"
+  end
+else
+  munin_plugin "sensors_fan" do
+    action :delete
+  end
+end
+
+if sensors_temp
+  munin_plugin "sensors_temp" do
+    target "sensors_"
+  end
+else
+  munin_plugin "sensors_temp" do
+    action :delete
+  end
+end
+
+if sensors_volt
+  munin_plugin "sensors_volt" do
+    target "sensors_"
+    conf "sensors_volt.erb"
+  end
+else
+  munin_plugin "sensors_volt" do
+    action :delete
+  end
+end
+
+munin_plugin "swap"
+munin_plugin "tcp"
+munin_plugin "threads"
+munin_plugin "uptime"
+munin_plugin "users"
+munin_plugin "vmstat"
index e9387b1e78b7009073ddc1b320469f2e71758646..bc58bf9751df3cd0b2ce6a07386883f5a54a1e73 100644 (file)
@@ -81,5 +81,5 @@ action_class do
 end
 
 def after_created
-  notifies :restart, "service[munin-node]" if restart_munin && node[:recipes].include?("munin")
+  notifies :restart, "service[munin-node]" if restart_munin
 end
index bbbca3c616cfd6c91c2262dd19c47f5487c2a22c..a8f14a0aead55ead5920f4c2094d76dd5940ed90 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "mysql-server"
 package "mysql-client"
 
index 93aab56906afd96dabce0acc328ffbc0a3ff5a62..aec734c17f2ae9dc9744b1dcdd78724bfeb58b4a 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "nginx"
 
 resolvers = node[:networking][:nameservers].map do |resolver|
index 5909c6caf2c19703f917d2d7b61df9c93d6e2186..71c3ee93c74ba633ea48fa4536d8592afae8d9c5 100644 (file)
@@ -7,7 +7,8 @@ description       "Installs and configures nominatim servers"
 version           "1.0.0"
 supports          "ubuntu"
 depends           "apache"
-depends           "postgresql"
-depends           "git"
 depends           "fail2ban"
+depends           "git"
+depends           "munin"
+depends           "postgresql"
 depends           "python"
index 1cd8d767e2e496f0dff1f2a56db7094221026545..0a245969ce6a58224ad2fec6a0962de20051cd66 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
index dd4a04ebf54d3b5f1e11be0b95d077b96265790c..1f875cdcc83e6a41af8ce0516a42c27c4ab6bf5c 100644 (file)
@@ -17,6 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include_recipe "munin"
+
 package %w[
   chrony
   tzdata
index a9ef419a0259669c1e2e905d95a58b735c12601d..03412e2ff8c7241a24c85fc6dfc777b90bc39151 100644 (file)
@@ -18,6 +18,7 @@
 #
 
 include_recipe "apache"
+include_recipe "munin"
 
 package "ruby#{node[:passenger][:ruby_version]}"
 package "ruby#{node[:passenger][:ruby_version]}-dev"
index d8ec3bd3c1110f2c5ac7723ef9f99d02873aea29..b72d4d1c5434fed666563c7d5e61e8c2ae0621d7 100644 (file)
@@ -19,6 +19,7 @@
 
 include_recipe "accounts"
 include_recipe "apache"
+include_recipe "munin"
 
 package %w[
   perl
index 47927729ea7b834fa8a051e40e6a84590c27a282..aca2267b73c01dab0d44ca4dadadd7d007d86bb3 100644 (file)
@@ -6,4 +6,5 @@ description       "Installs and configures postgresql"
 
 version           "1.0.0"
 supports          "ubuntu"
+depends           "munin"
 depends           "ohai"
index a79cde84d4157985dd80350907e9390fde06636b..9b17fae2a4a7a641ce2d76785ab223b8dcee38fb 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "locales-all"
 package "postgresql-common"
 
index a5af78090ea766595b5b53dc106d9abcd24da714..457228fee8d348bddb4349e247bca8afb67d32f1 100644 (file)
@@ -18,6 +18,7 @@
 #
 
 include_recipe "apt"
+include_recipe "munin"
 
 if node[:squid][:version] >= 3
   apt_package "squid" do
index 8c995d11e7734f97109a290d02c57ea7e34a0a69..716401065af07dee530f2e34f73fb70185b3b447 100644 (file)
@@ -8,6 +8,7 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "apache"
 depends           "git"
+depends           "munin"
 depends           "nodejs"
 depends           "postgresql"
 depends           "python"
index 971e953840e08391b3e59c47fce193c86fd99d8b..c1327d811bbd47adbd68818e70166002206ed03e 100644 (file)
@@ -19,6 +19,7 @@
 
 include_recipe "apache"
 include_recipe "git"
+include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "python"
index a2074862414cd9f79d50f1bd680f2ca0af7ca3fa..b5e65dc1a4f1c45cf9898fb4d7c36665c2fdfa57 100644 (file)
@@ -6,8 +6,8 @@ description       "Installs and configures a tile cache"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "ssl"
-depends           "squid"
-depends           "nginx"
-depends           "munin"
 depends           "fail2ban"
+depends           "munin"
+depends           "nginx"
+depends           "squid"
+depends           "ssl"
index 63de8a529f92a3b85802077c3161d2e14fb18f91..1cf0e7b2e0c9a4b4d03f3680915250152b7b5b01 100644 (file)
 
 require "ipaddr"
 
-include_recipe "ssl"
-include_recipe "squid"
-include_recipe "nginx"
 include_recipe "fail2ban"
+include_recipe "munin"
+include_recipe "nginx"
+include_recipe "squid"
+include_recipe "ssl"
 
 package "apache2" do
   action :remove
index 65a55181a9c81e62f75414fcbbb81c6cc29ea0c3..81096e2f19dd33360836748704e4c9fee558661b 100644 (file)
@@ -6,14 +6,15 @@ description       "Installs and configures www.openstreetmap.org servers"
 
 version           "1.0.1"
 supports          "ubuntu"
+depends           "accounts"
 depends           "apache"
-depends           "passenger"
+depends           "apt"
+depends           "geoipupdate"
 depends           "git"
 depends           "memcached"
-depends           "nodejs"
-depends           "tools"
+depends           "munin"
 depends           "nfs"
-depends           "accounts"
-depends           "apt"
+depends           "nodejs"
+depends           "passenger"
 depends           "systemd"
-depends           "geoipupdate"
+depends           "tools"
index a6af8715f290fd9c2a9381dd63402ee21c48c01c..c007d8e5dea41fa3ebb16bf4c6ccf495a97224d1 100644 (file)
@@ -24,6 +24,7 @@ include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
+include_recipe "munin"
 include_recipe "nodejs"
 
 web_passwords = data_bag_item("web", "passwords")
index bc08d820c4bd101c91ae3b1779e905d03ce44f6b..771901def23c713d669054371a00453d296d5b22 100644 (file)
@@ -91,7 +91,7 @@ run_list(
   "recipe[chef]",
   "recipe[devices]",
   "recipe[hardware]",
-  "recipe[munin]",
+  "recipe[munin::plugins]",
   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",