X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fa63c845987967418edaff22b75958916b19f19a..a45c1200e1b7b9ffdefe5fef3af9b1a93f5de31d:/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 c4e7e0501..2009ff6a5 100644
--- 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
 
-# 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| -%>
@@ -36,6 +27,8 @@ unknown_limit 144
     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] == "dub" -%>
+    address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "bm" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client.external_ipaddress -%>