Add new Amsterdam addresses to whitelists

[chef.git] / cookbooks / munin / templates / default / munin.conf.erb

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index c4e7e0501c0ca5a1be5942c1a8cce0ed661fa5a0..44afaa5b1c909ccaf9c13b89042e0397fb833d24 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -14,15 +14,6 @@ graph_strategy cgi
 # Use rrdcached
 rrdcached_socket /var/run/rrdcached.sock
 
 # Use rrdcached
 rrdcached_socket /var/run/rrdcached.sock
 

-# Configure alert targets
-contact.admins.command mail -s "Munin Notification for ${var:host}" admins@openstreetmap.org
-contact.admins.always_send invalid
-contact.null.command cat > /dev/null
-contact.null.always_send invalid
-
-# Send alerts to the admins by default
-contacts admins
-

 # Ignore uncontactable hosts for twelve hours
 unknown_limit 144
 <% @clients.sort { |a,b| a.name <=> b.name }.each do |client| -%>
 # Ignore uncontactable hosts for twelve hours
 unknown_limit 144
 <% @clients.sort { |a,b| a.name <=> b.name }.each do |client| -%>


@@ -36,7 +27,7 @@ unknown_limit 144
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ams" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ams" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>

-<% elsif client[:networking][:roles][:external][:zone] == "bm" -%>
+<% elsif client[:networking][:roles][:external][:zone] == "dub" -%>

     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client.external_ipaddress -%>
     address <%= client.external_ipaddress %>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client.external_ipaddress -%>
     address <%= client.external_ipaddress %>