X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7d2006054eae97e5278f10f5b4ea31f93315279c..4dca09e799a49d61e09a832a8d7bc23f2fc176a4:/cookbooks/munin/templates/default/munin.conf.erb?ds=sidebyside

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 3aa31b432..44afaa5b1 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,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 %>
-<% 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 %>
@@ -360,169 +351,6 @@ unknown_limit 144
     memcached_multi_bytes.bytes_written.label Traffic in (-) / out (+)
     memcached_multi_bytes.bytes_written.cdef bytes_written,8,*
 <% end -%>
-<% unless @tilecaches.empty? -%>
-
-# Configure compound graphs for tile.openstreetmap.org
-[tile.openstreetmap.org]
-    update no
-    network_in.graph_title Inbound network traffic
-    network_in.graph_vlabel bits in per ${graph_period}
-    network_in.graph_category network
-    network_in.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:if_%%interface%%.down", @tilecaches %>
-    network_in.graph_total total
-    network_in.graph_args --lower-limit 0
-<% @tilecaches.each do |tc| -%>
-    network_in.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-    network_in.<%= tc[:name].tr("-", "_") %>.cdef <%= tc[:name].tr("-", "_") %>,8,*
-    network_in.<%= tc[:name].tr("-", "_") %>.draw AREASTACK
-    network_in.<%= tc[:name].tr("-", "_") %>.min 0
-<% end -%>
-    network_out.graph_title Outbound network traffic
-    network_out.graph_vlabel bits out per ${graph_period}
-    network_out.graph_category network
-    network_out.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:if_%%interface%%.up", @tilecaches %>
-    network_out.graph_total total
-    network_out.graph_args --lower-limit 0
-<% @tilecaches.each do |tc| -%>
-    network_out.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-    network_out.<%= tc[:name].tr("-", "_") %>.cdef <%= tc[:name].tr("-", "_") %>,8,*
-    network_out.<%= tc[:name].tr("-", "_") %>.draw AREASTACK
-    network_out.<%= tc[:name].tr("-", "_") %>.min 0
-<% end -%>
-    squid_delay_pools.graph_title IPs being delayed with referer
-    squid_delay_pools.graph_args --base 1000 -l 0
-    squid_delay_pools.graph_vlabel IPs
-    squid_delay_pools.graph_order squid_delay1
-    squid_delay_pools.graph_category squid
-    squid_delay_pools.squid_delay1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:squid_delay_pools.squid_delay1", @tilecaches %>
-    squid_delay_pools.squid_delay1.label IPs
-    squid_delay_pools.squid_delay1.min 0
-    squid_delay_pools.squid_delay1.draw AREA
-    squid_delay_pools_noreferer.graph_title No-referer IPs being delayed
-    squid_delay_pools_noreferer.graph_args --base 1000 -l 0
-    squid_delay_pools_noreferer.graph_vlabel IPs
-    squid_delay_pools_noreferer.graph_order squid_delay2
-    squid_delay_pools_noreferer.graph_category squid
-    squid_delay_pools_noreferer.squid_delay2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:squid_delay_pools_noreferer.squid_delay2", @tilecaches %>
-    squid_delay_pools_noreferer.squid_delay2.label IPs
-    squid_delay_pools_noreferer.squid_delay2.min 0
-    squid_delay_pools_noreferer.squid_delay2.draw AREA
-    squid_requests.graph_title Squid client requests
-    squid_requests.graph_args --base 1000 -l 0
-    squid_requests.graph_vlabel requests / ${graph_period}
-    squid_requests.graph_order <%= Chef::Munin.expand "%%%name%%%_hits=%%name%%.openstreetmap.org:squid_requests.hits %%%name%%%_errors=%%name%%.openstreetmap.org:squid_requests.errors %%%name%%%_requests=%%name%%.openstreetmap.org:squid_requests.requests", @tilecaches %> hits=<%= @tilecaches.first[:name] %>.openstreetmap.org:squid_requests.hits errors=<%= @tilecaches.first[:name] %>.openstreetmap.org:squid_requests.errors requests=<%= @tilecaches.first[:name] %>.openstreetmap.org:squid_requests.requests
-    squid_requests.graph_total total
-    squid_requests.graph_category squid
-<% @tilecaches.each do |tc| -%>
-    squid_requests.<%= tc[:name].tr("-", "_") %>_hits.graph no
-    squid_requests.<%= tc[:name].tr("-", "_") %>_errors.graph no
-    squid_requests.<%= tc[:name].tr("-", "_") %>_requests.graph no
-<% end -%>
-    squid_requests.hits.cdef 0,<%= Chef::Munin.expand "%%%name%%%_hits", @tilecaches, ",+," %>,+
-    squid_requests.hits.label hits
-    squid_requests.hits.draw AREA
-    squid_requests.errors.cdef 0,<%= Chef::Munin.expand "%%%name%%%_errors", @tilecaches, ",+," %>,+
-    squid_requests.errors.label errors
-    squid_requests.errors.draw STACK
-    squid_requests.requests.cdef 0,<%= Chef::Munin.expand "%%%name%%%_requests", @tilecaches, ",+," %>,+,hits,-,errors,-
-    squid_requests.requests.label misses
-    squid_requests.requests.draw STACK
-    squid_traffic.graph_title Squid traffic status
-    squid_traffic.graph_args --base 1000
-    squid_traffic.graph_vlabel bits per ${graph_period}
-    squid_traffic.graph_order kbytes_in kbytes_out hit_kbytes_out
-    squid_traffic.graph_category squid
-    squid_traffic.kbytes_in.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:squid_traffic.kbytes_in", @tilecaches %>
-    squid_traffic.kbytes_in.label received
-    squid_traffic.kbytes_in.cdef kbytes_in,8096,*
-    squid_traffic.kbytes_out.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:squid_traffic.kbytes_out", @tilecaches %>
-    squid_traffic.kbytes_out.label sent
-    squid_traffic.kbytes_out.cdef kbytes_out,8096,*
-    squid_traffic.hit_kbytes_out.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:squid_traffic.hit_kbytes_out", @tilecaches %>
-    squid_traffic.hit_kbytes_out.label from cache
-    squid_traffic.hit_kbytes_out.cdef hit_kbytes_out,8096,*
-    squid_times_http.graph_title Squid Http Service Times
-    squid_times_http.graph_category squid
-    squid_times_http.graph_args --lower-limit 0
-    squid_times_http.graph_vlabel median reponse times (s)
-    squid_times_http.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_http", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_http.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_times_cmis.graph_title Squid Cache Miss Service Times
-    squid_times_cmis.graph_category squid
-    squid_times_cmis.graph_args --lower-limit 0
-    squid_times_cmis.graph_vlabel median reponse times (s)
-    squid_times_cmis.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_cmis", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_cmis.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_times_chits.graph_title Squid Cache Hit Service Times
-    squid_times_chits.graph_category squid
-    squid_times_chits.graph_args --lower-limit 0
-    squid_times_chits.graph_vlabel median reponse times (s)
-    squid_times_chits.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_chits", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_chits.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_times_nhits.graph_title Squid Cache Near Hit Service Times
-    squid_times_nhits.graph_category squid
-    squid_times_nhits.graph_args --lower-limit 0
-    squid_times_nhits.graph_vlabel median reponse times (s)
-    squid_times_nhits.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_nhits", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_nhits.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_times_nmr.graph_title Squid Cache Not Modified Service Times
-    squid_times_nmr.graph_category squid
-    squid_times_nmr.graph_args --lower-limit 0
-    squid_times_nmr.graph_vlabel median reponse times (s)
-    squid_times_nmr.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_nmr", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_nmr.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_times_dnsl.graph_title Squid Cache DNS Lookup Service Times
-    squid_times_dnsl.graph_category squid
-    squid_times_dnsl.graph_args --lower-limit 0
-    squid_times_dnsl.graph_vlabel median reponse times (s)
-    squid_times_dnsl.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:squid_times.mean_dnsl", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_times_dnsl.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-<% end -%>
-    squid_request_hitrates.graph_title Squid Cache Request Hit Rates
-    squid_request_hitrates.graph_category squid
-    squid_request_hitrates.graph_args --lower-limit 0 --upper-limit 100
-    squid_request_hitrates.graph_vlabel %
-    squid_request_hitrates.graph_order <%= Chef::Munin.expand "%%%name%%%_total=%%name%%.openstreetmap.org:squid_requests.requests %%%name%%%_hits=%%name%%.openstreetmap.org:squid_requests.hits", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_total.graph no
-    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.cdef <%= tc[:name].tr("-", "_") %>_hits,<%= tc[:name].tr("-", "_") %>_total,/,100,*
-    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %>
-    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1
-<% end -%>
-    squid_byte_hitrates.graph_title Squid Cache Byte Hit Rates
-    squid_byte_hitrates.graph_category squid
-    squid_byte_hitrates.graph_args --lower-limit 0 --upper-limit 100
-    squid_byte_hitrates.graph_vlabel %
-    squid_byte_hitrates.graph_order <%= Chef::Munin.expand "%%%name%%%_total=%%name%%.openstreetmap.org:squid_traffic.kbytes_out %%%name%%%_hits=%%name%%.openstreetmap.org:squid_traffic.hit_kbytes_out", @tilecaches %>
-<% @tilecaches.each do |tc| -%>
-    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_total.graph no
-    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.cdef <%= tc[:name].tr("-", "_") %>_hits,<%= tc[:name].tr("-", "_") %>_total,/,100,*
-    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %>
-    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1
-<% end -%>
-    nginx_requests.graph_title Nginx requests
-    nginx_requests.graph_vlabel Requests per ${graph_period}
-    nginx_requests.graph_category nginx
-    nginx_requests.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:nginx_request.request", @tilecaches %>
-    nginx_requests.graph_total total
-    nginx_requests.graph_args --lower-limit 0
-<% @tilecaches.each do |tc| -%>
-    nginx_requests.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
-    nginx_requests.<%= tc[:name].tr("-", "_") %>.draw AREASTACK
-    nginx_requests.<%= tc[:name].tr("-", "_") %>.min 0
-<% end -%>
-<% end -%>
 <% unless @renderers.empty? -%>
 
 # Configure compound graphs for render.openstreetmap.org