X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8c80f28569d1852809e9d5d994bcce9142aa76b5..9932bb5bbb698b7888da25c46774bb0e57838ba9:/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 7c9e149e8..79bdbda9a 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -36,6 +36,8 @@ unknown_limit 144
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ic" -%>
     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 -%>
     address <%= client.external_ipaddress %>
 <% end -%>
@@ -649,44 +651,6 @@ unknown_limit 144
 # Configure compound graphs for nominatim.openstreetmap.org
 [nominatim.openstreetmap]
     update no
-    apache_accesses.graph_title Apache accesses
-    apache_accesses.graph_vlabel accesses / ${graph_period}
-    apache_accesses.graph_category apache
-    apache_accesses.graph_order <%= Chef::Munin.expand "%%name%%=%%name%%.openstreetmap:apache_accesses.accesses80", @geocoders %>
-    apache_accesses.graph_total total
-<% @geocoders.each do |rs| -%>
-    apache_accesses.<%= rs[:name] %>.label <%= rs[:name] %>
-    apache_accesses.<%= rs[:name] %>.draw AREASTACK
-<% end -%>
-    apache_volume.graph_title Apache volume
-    apache_volume.graph_vlabel bytes per ${graph_period}
-    apache_volume.graph_category apache
-    apache_volume.graph_order <%= Chef::Munin.expand "%%name%%=%%name%%.openstreetmap:apache_volume.volume80", @geocoders %>
-    apache_volume.graph_total total
-<% @geocoders.each do |rs| -%>
-    apache_volume.<%= rs[:name] %>.label <%= rs[:name] %>
-    apache_volume.<%= rs[:name] %>.draw AREASTACK
-<% end -%>
-    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:if_%%interface%%.down", @geocoders %>
-    network_in.graph_total total
-<% @geocoders.each do |rs| -%>
-    network_in.<%= rs[:name] %>.label <%= rs[:name] %>
-    network_in.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,*
-    network_in.<%= rs[:name] %>.draw AREASTACK
-<% 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:if_%%interface%%.up", @geocoders %>
-    network_out.graph_total total
-<% @geocoders.each do |rs| -%>
-    network_out.<%= rs[:name] %>.label <%= rs[:name] %>
-    network_out.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,*
-    network_out.<%= rs[:name] %>.draw AREASTACK
-<% end -%>
     nominatim_requests.graph_title Requests by API call
     nominatim_requests.graph_args --base 1000 -l 0
     nominatim_requests.graph_vlabel requests per minute