X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f2b247390b55f09417fc14c99a7362a43f3599d6..8ae3b2a127b2e3851409a4fcfb26709a41005031:/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 eb3acc3cf..c4e7e0501 100644 --- a/cookbooks/munin/templates/default/munin.conf.erb +++ b/cookbooks/munin/templates/default/munin.conf.erb @@ -148,7 +148,7 @@ unknown_limit 144 apcpdu_humidity.humidity.label Humidity apcpdu_humidity.humidity.draw LINE2 apcpdu_humidity.humidity.min 0 -<% unless @frontends.empty? && @backends.empty? -%> +<% unless @frontends.empty? -%> # Configure compound graphs for www.openstreetmap.org [www.openstreetmap.org] @@ -285,245 +285,81 @@ unknown_limit 144 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 "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_get", @backends %> + memcached_multi_commands.cmd_get.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_get", @frontends %> memcached_multi_commands.cmd_get.label Gets - memcached_multi_commands.cmd_set.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_set", @backends %> + memcached_multi_commands.cmd_set.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_set", @frontends %> memcached_multi_commands.cmd_set.label Sets - memcached_multi_commands.cmd_touch.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_touch", @backends %> + memcached_multi_commands.cmd_touch.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.cmd_touch", @frontends %> memcached_multi_commands.cmd_touch.label Touches - memcached_multi_commands.get_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.get_hits", @backends %> + memcached_multi_commands.get_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.get_hits", @frontends %> memcached_multi_commands.get_hits.label Get Hits - memcached_multi_commands.get_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.get_misses", @backends %> + memcached_multi_commands.get_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.get_misses", @frontends %> memcached_multi_commands.get_misses.label Get Misses - memcached_multi_commands.delete_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.delete_hits", @backends %> + memcached_multi_commands.delete_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.delete_hits", @frontends %> memcached_multi_commands.delete_hits.label Delete Hits - memcached_multi_commands.delete_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.delete_misses", @backends %> + memcached_multi_commands.delete_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.delete_misses", @frontends %> memcached_multi_commands.delete_misses.label Delete Misses - memcached_multi_commands.incr_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.incr_hits", @backends %> + memcached_multi_commands.incr_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.incr_hits", @frontends %> memcached_multi_commands.incr_hits.label Increment Hits - memcached_multi_commands.incr_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.incr_misses", @backends %> + memcached_multi_commands.incr_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.incr_misses", @frontends %> memcached_multi_commands.incr_misses.label Increment Misses - memcached_multi_commands.decr_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.decr_hits", @backends %> + memcached_multi_commands.decr_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.decr_hits", @frontends %> memcached_multi_commands.decr_hits.label Decrement Hits - memcached_multi_commands.decr_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.decr_misses", @backends %> + memcached_multi_commands.decr_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.decr_misses", @frontends %> memcached_multi_commands.decr_misses.label Decrement Misses - memcached_multi_commands.touch_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.touch_hits", @backends %> + memcached_multi_commands.touch_hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.touch_hits", @frontends %> memcached_multi_commands.touch_hits.label Touch Hits - memcached_multi_commands.touch_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.touch_misses", @backends %> + memcached_multi_commands.touch_misses.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_commands.touch_misses", @frontends %> 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 memcached_multi_conns.graph_order max_conns curr_conns avg_conns - memcached_multi_conns.curr_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.curr_conns", @backends %> + memcached_multi_conns.curr_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.curr_conns", @frontends %> memcached_multi_conns.curr_conns.label Current Connections - memcached_multi_conns.max_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.max_conns", @backends %> + memcached_multi_conns.max_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.max_conns", @frontends %> memcached_multi_conns.max_conns.label Max Connections - memcached_multi_conns.avg_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.avg_conns", @backends %> + memcached_multi_conns.avg_conns.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_conns.avg_conns", @frontends %> memcached_multi_conns.avg_conns.label Avg Connections memcached_multi_evictions.graph_title Evictions memcached_multi_evictions.graph_vlabel Evictions per ${graph_period} memcached_multi_evictions.graph_category memcached - memcached_multi_evictions.evictions.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.evictions", @backends %> + memcached_multi_evictions.evictions.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.evictions", @frontends %> memcached_multi_evictions.evictions.label Evictions - memcached_multi_evictions.evicted_nonzero.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.evicted_nonzero", @backends %> + memcached_multi_evictions.evicted_nonzero.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.evicted_nonzero", @frontends %> memcached_multi_evictions.evicted_nonzero.label Evictions prior to Expire - memcached_multi_evictions.reclaimed.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.reclaimed", @backends %> + memcached_multi_evictions.reclaimed.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_evictions.reclaimed", @frontends %> memcached_multi_evictions.reclaimed.label Reclaimed Items memcached_multi_items.graph_title Items memcached_multi_items.graph_vlabel Items in Memcached memcached_multi_items.graph_category memcached memcached_multi_items.graph_order curr_items total_items - memcached_multi_items.curr_items.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_items.curr_items", @backends %> + memcached_multi_items.curr_items.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_items.curr_items", @frontends %> memcached_multi_items.curr_items.label Current Items - memcached_multi_items.total_items.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_items.total_items", @backends %> + memcached_multi_items.total_items.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_items.total_items", @frontends %> memcached_multi_items.total_items.label New Items memcached_multi_memory.graph_title Memory Usage memcached_multi_memory.graph_vlabel Bytes Used memcached_multi_memory.graph_category memcached memcached_multi_memory.graph_order limit_maxbytes bytes - memcached_multi_memory.limit_maxbytes.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_memory.limit_maxbytes", @backends %> + memcached_multi_memory.limit_maxbytes.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_memory.limit_maxbytes", @frontends %> memcached_multi_memory.limit_maxbytes.label Maximum Bytes Allocated - memcached_multi_memory.bytes.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_memory.bytes", @backends %> + memcached_multi_memory.bytes.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_memory.bytes", @frontends %> 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 - memcached_multi_bytes.bytes_read.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_bytes.bytes_read", @backends %> + memcached_multi_bytes.bytes_read.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_bytes.bytes_read", @frontends %> memcached_multi_bytes.bytes_read.label Network Traffic coming in (-) memcached_multi_bytes.bytes_read.cdef bytes_read,8,* memcached_multi_bytes.bytes_read.graph no - memcached_multi_bytes.bytes_written.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_bytes.bytes_written", @backends %> + memcached_multi_bytes.bytes_written.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:memcached_multi_bytes.bytes_written", @frontends %> 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.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("-", "_") %>.cdef <%= tc[:name].tr("-", "_") %>,8,* - 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