Disable munin email alerting

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index c4e7e0501c0ca5a1be5942c1a8cce0ed661fa5a0..cd20d4d9bf518158167060750f04f72479b1afeb 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| -%>

diff --git a/roles/munin.rb b/roles/munin.rb
index 1522c96e12a69023434ed4e6d6b93e184df6d73d..046360b0a98c2b963900b08f688c1776b7ac0014 100644 (file)
--- a/roles/munin.rb
+++ b/roles/munin.rb
@@ -1,16 +1,6 @@
 name "munin"
 description "Role applied to all munin servers"
 
 name "munin"
 description "Role applied to all munin servers"
 

-default_attributes(
-  :munin => {
-    :plugins => {
-      :munin_update => {
-        :contacts => "null"
-      }
-    }
-  }
-)
-

 run_list(
   "recipe[munin::server]"
 )
 run_list(
   "recipe[munin::server]"
 )