X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dc7c507259804d72756728eb28fadd84adb87ff6..bf16c782a9d8e78c4b14a35b899b81992f91155f:/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 791007f98..6b08b07fe 100644 --- a/cookbooks/munin/templates/default/munin.conf.erb +++ b/cookbooks/munin/templates/default/munin.conf.erb @@ -89,6 +89,7 @@ unknown_limit 144 <% end -%> <% end -%> <% end -%> +<% unless @frontends.empty? && @backends.empty? -%> # Configure compound graphs for www.openstreetmap.org [www.openstreetmap] @@ -150,10 +151,13 @@ 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 http401 http500 http502 http503 http509 + api_calls_error.graph_order http401 http422 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.http422.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http422", @frontends %> + api_calls_error.http422.label 422 Unprocessable Entity + api_calls_error.http422.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 @@ -292,6 +296,8 @@ unknown_limit 144 memcached_multi_bytes.bytes_written.negative bytes_read 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] @@ -442,6 +448,8 @@ unknown_limit 144 squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %> squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1 <% end -%> +<% end -%> +<% unless @renderers.empty? -%> # Configure compound graphs for render.openstreetmap.org [render.openstreetmap] @@ -702,6 +710,8 @@ 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 +<% end -%> +<% unless @geocoders.empty? -%> # Configure compound graphs for nominatim.openstreetmap.org [nominatim.openstreetmap] @@ -740,3 +750,4 @@ unknown_limit 144 nominatim_throttled_ips.block.label blocked nominatim_throttled_ips.block.draw STACK nominatim_throttled_ips.block.type GAUGE +<% end -%>