X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/74b8ce4c5490377bd6d8443fef1ae7ffc7e2848c..52e55367b5e2fa9a849d0155e011171da010c604:/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 1e3216fd0..5134e6da1 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 -%> @@ -141,17 +143,24 @@ unknown_limit 144 api_calls_error.graph_title HTTP errors api_calls_error.graph_vlabel Number of errors per ${graph_period} api_calls_error.graph_category api - api_calls_error.graph_order http500 http502 http503 http509 + api_calls_error.graph_order http401 http500 http502 http503 http509 + api_calls_error.http401.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http401", @frontends %> + api_calls_error.http401.label 401 Unauthorized + api_calls_error.http401.warning :0.5 api_calls_error.http500.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http500", @frontends %> api_calls_error.http500.label 500 Internal Server Error + api_calls_error.http500.warning :0.5 api_calls_error.http502.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http502", @frontends %> api_calls_error.http502.label 502 Bad Gateway + api_calls_error.http502.warning :0.5 api_calls_error.http503.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http503", @frontends %> api_calls_error.http503.label 503 Service Unavailable + api_calls_error.http503.warning :0.5 api_calls_error.http509.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http509", @frontends %> api_calls_error.http509.label 509 Bandwidth Limit Exceeded + api_calls_error.http509.warning :5 api_calls_num.graph_title Requests processed - api_calls_num.graph_vlabel Number of requests per minute + api_calls_num.graph_vlabel Number of requests per ${graph_period} api_calls_num.graph_category api api_calls_num.graph_order map upload amf history full trkpts web other api_calls_num.web.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.web", @frontends %> @@ -198,36 +207,36 @@ unknown_limit 144 api_waits_www.trkpts.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.trkpts", @frontends %> api_waits_www.trkpts.label GPX trackpoints calls api_waits_www.trkpts.cdef trkpts,2,/ - memcached_commands.graph_title Commands - memcached_commands.graph_vlabel Commands per ${graph_period} - memcached_commands.graph_category memcached - memcached_commands.graph_order cmd_get cmd_set cmd_touch get_hits get_misses delete_hits delete_misses incr_hits incr_misses decr_hits decr_misses touch_hits touch_misses - memcached_commands.cmd_get.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.cmd_get", @backends %> - memcached_commands.cmd_get.label Gets - memcached_commands.cmd_set.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.cmd_set", @backends %> - memcached_commands.cmd_set.label Sets - memcached_commands.cmd_touch.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.cmd_touch", @backends %> - memcached_commands.cmd_touch.label Touches - memcached_commands.get_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.get_hits", @backends %> - memcached_commands.get_hits.label Get Hits - memcached_commands.get_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.get_misses", @backends %> - memcached_commands.get_misses.label Get Misses - memcached_commands.delete_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.delete_hits", @backends %> - memcached_commands.delete_hits.label Delete Hits - memcached_commands.delete_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.delete_misses", @backends %> - memcached_commands.delete_misses.label Delete Misses - memcached_commands.incr_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.incr_hits", @backends %> - memcached_commands.incr_hits.label Increment Hits - memcached_commands.incr_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.incr_misses", @backends %> - memcached_commands.incr_misses.label Increment Misses - memcached_commands.decr_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.decr_hits", @backends %> - memcached_commands.decr_hits.label Decrement Hits - memcached_commands.decr_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.decr_misses", @backends %> - memcached_commands.decr_misses.label Decrement Misses - memcached_commands.touch_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.touch_hits", @backends %> - memcached_commands.touch_hits.label Touch Hits - memcached_commands.touch_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_commands.touch_misses", @backends %> - memcached_commands.touch_misses.label Touch Misses + memcached_multi_commands.graph_title Commands + memcached_multi_commands.graph_vlabel Commands per ${graph_period} + memcached_multi_commands.graph_category memcached + memcached_multi_commands.graph_order cmd_get cmd_set cmd_touch get_hits get_misses delete_hits delete_misses incr_hits incr_misses decr_hits decr_misses touch_hits touch_misses + memcached_multi_commands.cmd_get.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.cmd_get", @backends %> + memcached_multi_commands.cmd_get.label Gets + memcached_multi_commands.cmd_set.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.cmd_set", @backends %> + memcached_multi_commands.cmd_set.label Sets + memcached_multi_commands.cmd_touch.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.cmd_touch", @backends %> + memcached_multi_commands.cmd_touch.label Touches + memcached_multi_commands.get_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.get_hits", @backends %> + memcached_multi_commands.get_hits.label Get Hits + memcached_multi_commands.get_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.get_misses", @backends %> + memcached_multi_commands.get_misses.label Get Misses + memcached_multi_commands.delete_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.delete_hits", @backends %> + memcached_multi_commands.delete_hits.label Delete Hits + memcached_multi_commands.delete_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.delete_misses", @backends %> + memcached_multi_commands.delete_misses.label Delete Misses + memcached_multi_commands.incr_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.incr_hits", @backends %> + memcached_multi_commands.incr_hits.label Increment Hits + memcached_multi_commands.incr_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.incr_misses", @backends %> + memcached_multi_commands.incr_misses.label Increment Misses + memcached_multi_commands.decr_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.decr_hits", @backends %> + memcached_multi_commands.decr_hits.label Decrement Hits + memcached_multi_commands.decr_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.decr_misses", @backends %> + memcached_multi_commands.decr_misses.label Decrement Misses + memcached_multi_commands.touch_hits.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.touch_hits", @backends %> + memcached_multi_commands.touch_hits.label Touch Hits + memcached_multi_commands.touch_misses.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_commands.touch_misses", @backends %> + memcached_multi_commands.touch_misses.label Touch Misses memcached_multi_conns.graph_title Connections memcached_multi_conns.graph_vlabel Connections per ${graph_period} memcached_multi_conns.graph_category memcached @@ -264,6 +273,7 @@ unknown_limit 144 memcached_multi_memory.bytes.sum <%= Chef::Munin.expand "%%.openstreetmap:memcached_multi_memory.bytes", @backends %> memcached_multi_memory.bytes.label Current Bytes Used memcached_multi_bytes.graph_title Network Traffic + memcached_multi_bytes.graph_args --base 1000 memcached_multi_bytes.graph_vlabel bits in (-) / out (+) memcached_multi_bytes.graph_category memcached memcached_multi_bytes.graph_order bytes_read bytes_written @@ -282,24 +292,24 @@ unknown_limit 144 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", @tilecaches %> + network_in.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:if_%%interface%%.down", @tilecaches %> network_in.graph_total total <% @tilecaches.each do |tc| -%> - network_in.<%= tc[:name] %>.label <%= tc[:name] %> - network_in.<%= tc[:name] %>.cdef <%= tc[:name] %>,8,* - network_in.<%= tc[:name] %>.draw AREASTACK + 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 <% 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", @tilecaches %> + network_out.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:if_%%interface%%.up", @tilecaches %> network_out.graph_total total <% @tilecaches.each do |tc| -%> - network_out.<%= tc[:name] %>.label <%= tc[:name] %> - network_out.<%= tc[:name] %>.cdef <%= tc[:name] %>,8,* - network_out.<%= tc[:name] %>.draw AREASTACK + 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 <% end -%> - squid_delay_pools.graph_title IPs being delayed + 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 @@ -308,6 +318,15 @@ unknown_limit 144 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: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} @@ -341,49 +360,49 @@ unknown_limit 144 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:squid_times.mean_http", @tilecaches %> + squid_times_http.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_http", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_http.<%= tc[:name] %>.label <%= tc[:name] %> + 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:squid_times.mean_cmis", @tilecaches %> + squid_times_cmis.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_cmis", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_cmis.<%= tc[:name] %>.label <%= tc[:name] %> + 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:squid_times.mean_chits", @tilecaches %> + squid_times_chits.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_chits", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_chits.<%= tc[:name] %>.label <%= tc[:name] %> + 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:squid_times.mean_nhits", @tilecaches %> + squid_times_nhits.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_nhits", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_nhits.<%= tc[:name] %>.label <%= tc[:name] %> + 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:squid_times.mean_nmr", @tilecaches %> + squid_times_nmr.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_nmr", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_nmr.<%= tc[:name] %>.label <%= tc[:name] %> + 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:squid_times.mean_dnsl", @tilecaches %> + squid_times_dnsl.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:squid_times.mean_dnsl", @tilecaches %> <% @tilecaches.each do |tc| -%> - squid_times_dnsl.<%= tc[:name] %>.label <%= tc[:name] %> + squid_times_dnsl.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> # Configure compound graphs for render.openstreetmap.org @@ -392,40 +411,40 @@ unknown_limit 144 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", @renderers %> + apache_accesses.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:apache_accesses.accesses80", @renderers %> apache_accesses.graph_total total <% @renderers.each do |rs| -%> - apache_accesses.<%= rs[:name] %>.label <%= rs[:name] %> - apache_accesses.<%= rs[:name] %>.draw AREASTACK + apache_accesses.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> + apache_accesses.<%= rs[:name].tr("-", "_") %>.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", @renderers %> + apache_volume.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:apache_volume.volume80", @renderers %> apache_volume.graph_total total <% @renderers.each do |rs| -%> - apache_volume.<%= rs[:name] %>.label <%= rs[:name] %> - apache_volume.<%= rs[:name] %>.draw AREASTACK + apache_volume.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> + apache_volume.<%= rs[:name].tr("-", "_") %>.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", @renderers %> + network_in.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:if_%%interface%%.down", @renderers %> network_in.graph_total total <% @renderers.each do |rs| -%> - network_in.<%= rs[:name] %>.label <%= rs[:name] %> - network_in.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,* - network_in.<%= rs[:name] %>.draw AREASTACK + network_in.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> + network_in.<%= rs[:name].tr("-", "_") %>.cdef <%= rs[:name].tr("-", "_") %>,8,* + network_in.<%= rs[:name].tr("-", "_") %>.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", @renderers %> + network_out.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:if_%%interface%%.up", @renderers %> network_out.graph_total total <% @renderers.each do |rs| -%> - network_out.<%= rs[:name] %>.label <%= rs[:name] %> - network_out.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,* - network_out.<%= rs[:name] %>.draw AREASTACK + network_out.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> + network_out.<%= rs[:name].tr("-", "_") %>.cdef <%= rs[:name].tr("-", "_") %>,8,* + network_out.<%= rs[:name].tr("-", "_") %>.draw AREASTACK <% end -%> mod_tile_fresh.graph_title freshness of served tiles mod_tile_fresh.graph_args --base 1000 -l 0 @@ -637,3 +656,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