X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e5dcd3ae4542c09c663e3648b474f2b227801e36..0d173e941fee49bf2e74ebb12537a83c84a22148:/cookbooks/munin/recipes/server.rb?ds=sidebyside

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 5861bf5ea..bda824f44 100644
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: munin
+# Cookbook:: munin
 # Recipe:: server
 #
-# 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
 #
-#     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,
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "munin"
 package "rrdcached"
@@ -27,13 +27,13 @@ template "/etc/default/rrdcached" do
   source "rrdcached.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 directory "/var/lib/munin/rrdcached" do
   owner "munin"
   group "munin"
-  mode 0o755
+  mode "755"
 end
 
 service "rrdcached" do
@@ -45,28 +45,25 @@ munin_plugin "rrdcached"
 
 expiry_time = 14 * 86400
 
-clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } # ~FC010
-frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010
-backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010
-tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name)
+frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
 end
-renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
 end
-geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
+  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
 end
 
 template "/etc/munin/munin.conf" do
   source "munin.conf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
   variables :expiry_time => expiry_time, :clients => clients,
-            :frontends => frontends, :backends => backends,
-            :tilecaches => tilecaches, :renderers => renderers,
-            :geocoders => geocoders
+            :frontends => frontends, :geocoders => geocoders,
+            :renderers => renderers
 end
 
 apache_module "fcgid"
@@ -77,17 +74,17 @@ remote_directory "/srv/munin.openstreetmap.org" do
   source "www"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode "644"
 end
 
 # directory to put dumped files in
 directory "/srv/munin.openstreetmap.org/dumps" do
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 ssl_certificate "munin.openstreetmap.org" do
@@ -103,22 +100,7 @@ template "/etc/cron.daily/munin-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o755
-end
-
-# simple shell script to dump RRD data to a file
-cookbook_file "/usr/local/bin/rrddump" do
-  source "rrddump.sh"
-  owner "root"
-  group "root"
-  mode 0o755
-end
-
-template "/etc/cron.d/rrddump" do
-  source "rrddump.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+  mode "755"
 end
 
 munin_plugin "munin_stats"