X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6cc1262e39e572da9ec0fc55bd5f93e99ddb344e..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 bf37514c9..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 -%> @@ -645,3 +647,41 @@ unknown_limit 144 renderd_zoom_time.zoomtime6.cdef zoomtime6,1000,/ renderd_zoom_time.zoomtime6.draw STACK renderd_zoom_time.zoomtime6.info Time for Metatiles for z19 - z20 + +# Configure compound graphs for nominatim.openstreetmap.org +[nominatim.openstreetmap] + update no + nominatim_requests.graph_title Requests by API call + nominatim_requests.graph_args --base 1000 -l 0 + nominatim_requests.graph_vlabel requests per minute + nominatim_requests.graph_category nominatim + nominatim_requests.graph_order z1 z2 z3 z4 + nominatim_requests.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z1", @geocoders %> + nominatim_requests.z1.label reverse + nominatim_requests.z1.draw AREA + nominatim_requests.z1.type GAUGE + nominatim_requests.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z2", @geocoders %> + nominatim_requests.z2.label search (successful) + nominatim_requests.z2.draw STACK + nominatim_requests.z2.type GAUGE + nominatim_requests.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z3", @geocoders %> + nominatim_requests.z3.label search (no result) + nominatim_requests.z3.draw STACK + nominatim_requests.z3.type GAUGE + nominatim_requests.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z4", @geocoders %> + nominatim_requests.z4.label details + nominatim_requests.z4.draw STACK + nominatim_requests.z4.type GAUGE + nominatim_throttled_ips.graph_title Restricted IPs + nominatim_throttled_ips.graph_args -l 0 + nominatim_throttled_ips.graph_vlabel number of IPs + nominatim_throttled_ips.graph_category nominatim + nominatim_throttled_ips.graph_order bulk block + nominatim_throttled_ips.bulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_throttled_ips.bulk", @geocoders %> + nominatim_throttled_ips.bulk.label bulk + nominatim_throttled_ips.bulk.draw AREA + nominatim_throttled_ips.bulk.type GAUGE + nominatim_throttled_ips.block.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_throttled_ips.block", @geocoders %> + nominatim_throttled_ips.block.label blocked + nominatim_throttled_ips.block.draw STACK + nominatim_throttled_ips.block.type GAUGE