X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e8aba0172c12abeaa6a497bce59f1bc3f626ca4a..e41ce8527c0cc0e9a9984a8459cbd3dd508bdda3:/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 ba642826b..3aa31b432 100644 --- a/cookbooks/munin/templates/default/munin.conf.erb +++ b/cookbooks/munin/templates/default/munin.conf.erb @@ -25,16 +25,16 @@ contacts admins # Ignore uncontactable hosts for twelve hours unknown_limit 144 -<% @clients.sort { |a,b| a[:hostname] <=> b[:hostname] }.each do |client| -%> +<% @clients.sort { |a,b| a.name <=> b.name }.each do |client| -%> -# Configure monitoring for <%= client[:fqdn] %> -[<%= client[:hostname] %>.openstreetmap] +# Configure monitoring for <%= client.name %> +[<%= client.name %>] <% if Time.now - Time.at(client[:ohai_time]) > @expiry_time -%> update no <% end -%> <% if client[:networking][:roles][:external][:zone] == "ucl" -%> address <%= client.internal_ipaddress || client.external_ipaddress %> -<% elsif client[:networking][:roles][:external][:zone] == "ic" -%> +<% elsif client[:networking][:roles][:external][:zone] == "ams" -%> address <%= client.internal_ipaddress || client.external_ipaddress %> <% elsif client[:networking][:roles][:external][:zone] == "bm" -%> address <%= client.internal_ipaddress || client.external_ipaddress %> @@ -49,6 +49,9 @@ unknown_limit 144 <% if client[:munin][:plugins][plugin][value][:graph] -%> <%= plugin %>.<%= value %>.graph <%= client[:munin][:plugins][plugin][value][:graph] %> <% end -%> +<% if client[:munin][:plugins][plugin][value][:draw] -%> + <%= plugin %>.<%= value %>.draw <%= client[:munin][:plugins][plugin][value][:draw] %> +<% end -%> <% if client[:munin][:plugins][plugin][value][:label] -%> <%= plugin %>.<%= value %>.label <%= client[:munin][:plugins][plugin][value][:label] %> <% end -%> @@ -87,234 +90,311 @@ unknown_limit 144 <% end -%> <% end -%> +# Configure monitoring for switch1.openstreetmap.org +[openstreetmap.org;switch1.openstreetmap.org] + address 10.0.48.10 + use_node_name no + +# Configure monitoring for pdu1.ams.openstreetmap.org +[openstreetmap.org;pdu1.ams.openstreetmap.org] + address 10.0.48.10 + use_node_name no + +# Configure monitoring for pdu1.ams.openstreetmap.org +[openstreetmap.org;pdu2.ams.openstreetmap.org] + address 10.0.48.10 + use_node_name no + +# Configure compound graphs for ams.openstreetmap.org +[ams.openstreetmap.org] + update no + apcpdu_current.graph_title Load + apcpdu_current.graph_args --lower-limit 0 + apcpdu_current.graph_vlabel Amps + apcpdu_current.graph_category power + apcpdu_current.graph_order pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_current.current pdu2=pdu2.ams.openstreetmap.org:snmp_pdu2_ams_openstreetmap_org_apcpdu_current.current + apcpdu_current.graph_total total + apcpdu_current.pdu1.label PDU A + apcpdu_current.pdu1.draw AREASTACK + apcpdu_current.pdu1.min 0 + apcpdu_current.pdu2.label PDU B + apcpdu_current.pdu2.draw AREASTACK + apcpdu_current.pdu2.min 0 + apcpdu_power.graph_title Power + apcpdu_power.graph_args --base 1000 --lower-limit 0 + apcpdu_power.graph_vlabel Watts + apcpdu_power.graph_category power + apcpdu_power.graph_order pdu1=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_power.power pdu2=pdu2.ams.openstreetmap.org:snmp_pdu2_ams_openstreetmap_org_apcpdu_power.power + apcpdu_power.graph_total total + apcpdu_power.pdu1.label PDU A + apcpdu_power.pdu1.draw AREASTACK + apcpdu_power.pdu1.min 0 + apcpdu_power.pdu2.label PDU B + apcpdu_power.pdu2.draw AREASTACK + apcpdu_power.pdu2.min 0 + apcpdu_temperature.graph_title Temperature + apcpdu_temperature.graph_args --lower-limit 0 + apcpdu_temperature.graph_vlabel Degrees Celsius + apcpdu_temperature.graph_category sensors + apcpdu_temperature.graph_order temperature=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_temperature.temperature + apcpdu_temperature.temperature.label Temperature + apcpdu_temperature.temperature.draw LINE2 + apcpdu_temperature.temperature.min 0 + apcpdu_humidity.graph_title Humidity + apcpdu_humidity.graph_args --lower-limit 0 + apcpdu_humidity.graph_vlabel % + apcpdu_humidity.graph_category sensors + apcpdu_humidity.graph_order humidity=pdu1.ams.openstreetmap.org:snmp_pdu1_ams_openstreetmap_org_apcpdu_humidity.humidity + apcpdu_humidity.humidity.label Humidity + apcpdu_humidity.humidity.draw LINE2 + apcpdu_humidity.humidity.min 0 +<% unless @frontends.empty? -%> + # Configure compound graphs for www.openstreetmap.org -[www.openstreetmap] +[www.openstreetmap.org] update no apache_accesses.graph_title Apache accesses apache_accesses.graph_vlabel accesses / ${graph_period} apache_accesses.graph_category apache - apache_accesses.accesses80.sum <%= Chef::Munin.expand "%%.openstreetmap:apache_accesses.accesses80", @frontends %> + apache_accesses.graph_args --lower-limit 0 + apache_accesses.accesses80.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:apache_accesses.accesses80", @frontends %> apache_accesses.accesses80.label port 80 + apache_accesses.accesses80.min 0 apache_volume.graph_title Apache volume apache_volume.graph_vlabel bytes per ${graph_period} apache_volume.graph_category apache - apache_volume.volume80.sum <%= Chef::Munin.expand "%%.openstreetmap:apache_volume.volume80", @frontends %> + apache_volume.graph_args --lower-limit 0 + apache_volume.volume80.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:apache_volume.volume80", @frontends %> apache_volume.volume80.label port 80 - if_eth0.graph_title eth0 traffic - if_eth0.graph_vlabel bits in (-) / out (+) per ${graph_period} - if_eth0.graph_category network - if_eth0.graph_order down up - if_eth0.down.sum <%= Chef::Munin.expand "%%.openstreetmap:if_eth0.down", @frontends %> - if_eth0.down.label received - if_eth0.down.cdef down,8,* - if_eth0.up.sum <%= Chef::Munin.expand "%%.openstreetmap:if_eth0.up", @frontends %> - if_eth0.up.label sent - if_eth0.up.cdef up,8,* - if_eth1.graph_title eth1 traffic - if_eth1.graph_vlabel bits in (-) / out (+) per ${graph_period} - if_eth1.graph_category network - if_eth1.graph_order down up - if_eth1.down.sum <%= Chef::Munin.expand "%%.openstreetmap:if_eth1.down", @frontends %> - if_eth1.down.label received - if_eth1.down.cdef down,8,* - if_eth1.up.sum <%= Chef::Munin.expand "%%.openstreetmap:if_eth1.up", @frontends %> - if_eth1.up.label sent - if_eth1.up.cdef up,8,* + apache_volume.volume80.min 0 + 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", @frontends %> + network_in.graph_total total + network_in.graph_args --lower-limit 0 +<% @frontends.each do |fe| -%> + network_in.<%= fe[:name].tr("-", "_") %>.label <%= fe[:name] %> + network_in.<%= fe[:name].tr("-", "_") %>.cdef <%= fe[:name].tr("-", "_") %>,8,* + network_in.<%= fe[:name].tr("-", "_") %>.draw AREASTACK + network_in.<%= fe[: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", @frontends %> + network_out.graph_total total + network_out.graph_args --lower-limit 0 +<% @frontends.each do |fe| -%> + network_out.<%= fe[:name].tr("-", "_") %>.label <%= fe[:name] %> + network_out.<%= fe[:name].tr("-", "_") %>.cdef <%= fe[:name].tr("-", "_") %>,8,* + network_out.<%= fe[:name].tr("-", "_") %>.draw AREASTACK + network_out.<%= fe[:name].tr("-", "_") %>.min 0 +<% end -%> api_calls_www.graph_title Active requests api_calls_www.graph_vlabel Number of requests api_calls_www.graph_category api api_calls_www.graph_order map upload amf history full trkpts web other - api_calls_www.web.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.web", @frontends %> + api_calls_www.web.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.web", @frontends %> api_calls_www.web.label Web site traffic - api_calls_www.upload.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.upload", @frontends %> + api_calls_www.upload.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.upload", @frontends %> api_calls_www.upload.label Changeset diff uploads - api_calls_www.other.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.other", @frontends %> + api_calls_www.other.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.other", @frontends %> api_calls_www.other.label Other API calls - api_calls_www.amf.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.amf", @frontends %> + api_calls_www.amf.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.amf", @frontends %> api_calls_www.amf.label AMF API calls - api_calls_www.history.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.history", @frontends %> + api_calls_www.history.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.history", @frontends %> api_calls_www.history.label Element history fetches - api_calls_www.full.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.full", @frontends %> + api_calls_www.full.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.full", @frontends %> api_calls_www.full.label Full element fetches - api_calls_www.map.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.map", @frontends %> + api_calls_www.map.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.map", @frontends %> api_calls_www.map.label Map API calls - api_calls_www.trkpts.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_%%%.trkpts", @frontends %> + api_calls_www.trkpts.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_%%%name%%%.trkpts", @frontends %> api_calls_www.trkpts.label GPX trackpoints calls 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.http401.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http401", @frontends %> + api_calls_error.graph_order http401 http422 http500 http502 http503 http509 + api_calls_error.http401.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.http422.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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 "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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 ${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 %> + api_calls_num.web.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.web", @frontends %> api_calls_num.web.label Web site traffic - api_calls_num.upload.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.upload", @frontends %> + api_calls_num.upload.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.upload", @frontends %> api_calls_num.upload.label Changeset diff uploads - api_calls_num.other.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.other", @frontends %> + api_calls_num.other.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.other", @frontends %> api_calls_num.other.label Other API calls - api_calls_num.amf.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.amf", @frontends %> + api_calls_num.amf.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.amf", @frontends %> api_calls_num.amf.label AMF API calls - api_calls_num.history.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.history", @frontends %> + api_calls_num.history.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.history", @frontends %> api_calls_num.history.label Element history fetches - api_calls_num.full.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.full", @frontends %> + api_calls_num.full.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.full", @frontends %> api_calls_num.full.label Full element fetches - api_calls_num.map.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.map", @frontends %> + api_calls_num.map.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.map", @frontends %> api_calls_num.map.label Map API calls - api_calls_num.trkpts.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_num.trkpts", @frontends %> + api_calls_num.trkpts.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_calls_num.trkpts", @frontends %> api_calls_num.trkpts.label GPX trackpoints calls api_waits_www.graph_title Wait times for active requests api_waits_www.graph_vlabel Average time of requests api_waits_www.graph_category api api_waits_www.graph_order map upload amf history full trkpts web other - api_waits_www.web.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.web", @frontends %> + api_waits_www.web.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.web", @frontends %> api_waits_www.web.label Web site traffic api_waits_www.web.cdef web,2,/ - api_waits_www.upload.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.upload", @frontends %> + api_waits_www.upload.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.upload", @frontends %> api_waits_www.upload.label Changeset diff uploads api_waits_www.upload.cdef upload,2,/ - api_waits_www.other.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.other", @frontends %> + api_waits_www.other.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.other", @frontends %> api_waits_www.other.label Other API calls api_waits_www.other.cdef other,2,/ - api_waits_www.amf.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.amf", @frontends %> + api_waits_www.amf.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.amf", @frontends %> api_waits_www.amf.label AMF API calls api_waits_www.amf.cdef amf,2,/ - api_waits_www.history.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.history", @frontends %> + api_waits_www.history.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.history", @frontends %> api_waits_www.history.label Element history fetches api_waits_www.history.cdef history,2,/ - api_waits_www.full.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.full", @frontends %> + api_waits_www.full.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.full", @frontends %> api_waits_www.full.label Full element fetches api_waits_www.full.cdef full,2,/ - api_waits_www.map.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.map", @frontends %> + api_waits_www.map.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.map", @frontends %> api_waits_www.map.label Map API calls api_waits_www.map.cdef map,2,/ - api_waits_www.trkpts.sum <%= Chef::Munin.expand "%%.openstreetmap:api_waits_%%%.trkpts", @frontends %> + api_waits_www.trkpts.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:api_waits_%%%name%%%.trkpts", @frontends %> api_waits_www.trkpts.label GPX trackpoints calls api_waits_www.trkpts.cdef trkpts,2,/ 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.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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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 "%%.openstreetmap: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] +[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:if_%%interface%%.down", @tilecaches %> + 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:if_%%interface%%.up", @tilecaches %> + 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:squid_delay_pools.squid_delay1", @tilecaches %> + 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 @@ -323,45 +403,49 @@ unknown_limit 144 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.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 hits errors requests + 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 - squid_requests.hits.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_requests.hits", @tilecaches %> +<% @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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_requests.errors", @tilecaches %> + squid_requests.errors.cdef 0,<%= Chef::Munin.expand "%%%name%%%_errors", @tilecaches, ",+," %>,+ squid_requests.errors.label errors squid_requests.errors.draw STACK - squid_requests.requests.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_requests.requests", @tilecaches %> + squid_requests.requests.cdef 0,<%= Chef::Munin.expand "%%%name%%%_requests", @tilecaches, ",+," %>,+,hits,-,errors,- squid_requests.requests.label misses - squid_requests.requests.cdef requests,hits,-,errors,- 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:squid_traffic.kbytes_in", @tilecaches %> + 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:squid_traffic.kbytes_out", @tilecaches %> + 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:squid_traffic.hit_kbytes_out", @tilecaches %> + 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:squid_times.mean_http", @tilecaches %> + 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 -%> @@ -369,7 +453,7 @@ unknown_limit 144 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.org:squid_times.mean_cmis", @tilecaches %> <% @tilecaches.each do |tc| -%> squid_times_cmis.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> @@ -377,7 +461,7 @@ unknown_limit 144 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.org:squid_times.mean_chits", @tilecaches %> <% @tilecaches.each do |tc| -%> squid_times_chits.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> @@ -385,7 +469,7 @@ unknown_limit 144 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.org:squid_times.mean_nhits", @tilecaches %> <% @tilecaches.each do |tc| -%> squid_times_nhits.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> @@ -393,7 +477,7 @@ unknown_limit 144 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.org:squid_times.mean_nmr", @tilecaches %> <% @tilecaches.each do |tc| -%> squid_times_nmr.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> @@ -401,7 +485,7 @@ unknown_limit 144 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.org:squid_times.mean_dnsl", @tilecaches %> <% @tilecaches.each do |tc| -%> squid_times_dnsl.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %> <% end -%> @@ -409,7 +493,7 @@ unknown_limit 144 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:squid_requests.requests %%%name%%%_hits=%%name%%.openstreetmap:squid_requests.hits", @tilecaches %> + 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,* @@ -420,76 +504,97 @@ unknown_limit 144 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:squid_traffic.kbytes_out %%%name%%%_hits=%%name%%.openstreetmap:squid_trafffic.hit_kbytes_out", @tilecaches %> + 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("-", "_") %>.draw AREASTACK + nginx_requests.<%= tc[:name].tr("-", "_") %>.min 0 +<% end -%> +<% end -%> +<% unless @renderers.empty? -%> # Configure compound graphs for render.openstreetmap.org -[render.openstreetmap] +[render.openstreetmap.org] 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", @renderers %> + apache_accesses.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:apache_accesses.accesses80", @renderers %> apache_accesses.graph_total total + apache_accesses.graph_args --lower-limit 0 <% @renderers.each do |rs| -%> apache_accesses.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> apache_accesses.<%= rs[:name].tr("-", "_") %>.draw AREASTACK + apache_accesses.<%= rs[:name].tr("-", "_") %>.min 0 <% 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.org:apache_volume.volume80", @renderers %> apache_volume.graph_total total + apache_volume.graph_args --lower-limit 0 <% @renderers.each do |rs| -%> apache_volume.<%= rs[:name].tr("-", "_") %>.label <%= rs[:name] %> apache_volume.<%= rs[:name].tr("-", "_") %>.draw AREASTACK + apache_volume.<%= rs[:name].tr("-", "_") %>.min 0 <% 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.org:if_%%interface%%.down", @renderers %> network_in.graph_total total + network_in.graph_args --lower-limit 0 <% @renderers.each do |rs| -%> 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 + network_in.<%= rs[: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:if_%%interface%%.up", @renderers %> + network_out.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap.org:if_%%interface%%.up", @renderers %> network_out.graph_total total + network_out.graph_args --lower-limit 0 <% @renderers.each do |rs| -%> 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 + network_out.<%= rs[:name].tr("-", "_") %>.min 0 <% end -%> mod_tile_fresh.graph_title freshness of served tiles mod_tile_fresh.graph_args --base 1000 -l 0 mod_tile_fresh.graph_vlabel tiles per ${graph_period} mod_tile_fresh.graph_order fresh freshrender old oldrender outdated outdatedrender mod_tile_fresh.graph_category mod_tile - mod_tile_fresh.fresh.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.fresh", @renderers %> + mod_tile_fresh.fresh.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.fresh", @renderers %> mod_tile_fresh.fresh.label Fresh from disk mod_tile_fresh.fresh.draw AREA - mod_tile_fresh.freshrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.freshrender", @renderers %> + mod_tile_fresh.freshrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.freshrender", @renderers %> mod_tile_fresh.freshrender.label Freshly rendered mod_tile_fresh.freshrender.draw STACK - mod_tile_fresh.old.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.old", @renderers %> + mod_tile_fresh.old.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.old", @renderers %> mod_tile_fresh.old.label Old from disk mod_tile_fresh.old.draw STACK - mod_tile_fresh.oldrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.oldrender", @renderers %> + mod_tile_fresh.oldrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.oldrender", @renderers %> mod_tile_fresh.oldrender.label Old tile, attempted render mod_tile_fresh.oldrender.draw STACK - mod_tile_fresh.outdated.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.outdated", @renderers %> + mod_tile_fresh.outdated.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.outdated", @renderers %> mod_tile_fresh.outdated.label Outdated from disk mod_tile_fresh.outdated.draw STACK - mod_tile_fresh.outdatedrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_fresh.outdatedrender", @renderers %> + mod_tile_fresh.outdatedrender.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_fresh.outdatedrender", @renderers %> mod_tile_fresh.outdatedrender.label Outdated tile, attempted render mod_tile_fresh.outdatedrender.draw STACK mod_tile_response.graph_title mod_tile HTTP response codes @@ -497,16 +602,16 @@ unknown_limit 144 mod_tile_response.graph_vlabel responses per ${graph_period} mod_tile_response.graph_order response200 response304 response404 response500 mod_tile_response.graph_category mod_tile - mod_tile_response.response200.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_response.response200", @renderers %> + mod_tile_response.response200.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_response.response200", @renderers %> mod_tile_response.response200.label 200 OK mod_tile_response.response200.draw AREA - mod_tile_response.response304.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_response.response304", @renderers %> + mod_tile_response.response304.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_response.response304", @renderers %> mod_tile_response.response304.label 304 Not Modified mod_tile_response.response304.draw STACK - mod_tile_response.response404.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_response.response404", @renderers %> + mod_tile_response.response404.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_response.response404", @renderers %> mod_tile_response.response404.label 404 Not Found mod_tile_response.response404.draw STACK - mod_tile_response.response500.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_response.response500", @renderers %> + mod_tile_response.response500.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_response.response500", @renderers %> mod_tile_response.response500.label 500 Internal Error mod_tile_response.response500.draw STACK mod_tile_zoom.graph_title mod_tile responses by zoom layer @@ -514,22 +619,22 @@ unknown_limit 144 mod_tile_zoom.graph_vlabel responses per ${graph_period} mod_tile_zoom.graph_order z1 z2 z3 z4 z5 z6 mod_tile_zoom.graph_category mod_tile - mod_tile_zoom.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z1", @renderers %> + mod_tile_zoom.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z1", @renderers %> mod_tile_zoom.z1.label z1-8 mod_tile_zoom.z1.draw AREA - mod_tile_zoom.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z2", @renderers %> + mod_tile_zoom.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z2", @renderers %> mod_tile_zoom.z2.label z9-12 mod_tile_zoom.z2.draw STACK - mod_tile_zoom.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z3", @renderers %> + mod_tile_zoom.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z3", @renderers %> mod_tile_zoom.z3.label z13-14 mod_tile_zoom.z3.draw STACK - mod_tile_zoom.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z4", @renderers %> + mod_tile_zoom.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z4", @renderers %> mod_tile_zoom.z4.label z15-16 mod_tile_zoom.z4.draw STACK - mod_tile_zoom.z5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z5", @renderers %> + mod_tile_zoom.z5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z5", @renderers %> mod_tile_zoom.z5.label z17-18 mod_tile_zoom.z5.draw STACK - mod_tile_zoom.z6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:mod_tile_zoom.z6", @renderers %> + mod_tile_zoom.z6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:mod_tile_zoom.z6", @renderers %> mod_tile_zoom.z6.label z19-20 mod_tile_zoom.z6.draw STACK renderd_queue.graph_title Renderd queue length @@ -537,48 +642,48 @@ unknown_limit 144 renderd_queue.graph_vlabel metatiles renderd_queue.graph_order reqPrio req reqLow dirty reqBulk renderd_queue.graph_category renderd - renderd_queue.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue.reqPrio", @renderers %> + renderd_queue.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue.reqPrio", @renderers %> renderd_queue.reqPrio.label Priority request Queue renderd_queue.reqPrio.type GAUGE - renderd_queue.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue.req", @renderers %> + renderd_queue.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue.req", @renderers %> renderd_queue.req.label Request Queue renderd_queue.req.type GAUGE - renderd_queue.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue.reqLow", @renderers %> + renderd_queue.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue.reqLow", @renderers %> renderd_queue.reqLow.label Low priority request Queue renderd_queue.reqLow.type GAUGE - renderd_queue.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue.dirty", @renderers %> + renderd_queue.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue.dirty", @renderers %> renderd_queue.dirty.label Dirty Queue renderd_queue.dirty.type GAUGE - renderd_queue.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue.reqBulk", @renderers %> + renderd_queue.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue.reqBulk", @renderers %> renderd_queue.reqBulk.label Bulk request Queue renderd_queue.reqBulk.type GAUGE renderd_processed.graph_title Renderd throughput renderd_processed.graph_args --base 1000 -l 0 renderd_processed.graph_vlabel Metatiles per ${graph_period} - renderd_processed.graph_order req reqLow reqPrio dirty reqBulk dropped + renderd_processed.graph_order reqPrio req reqLow dirty reqBulk dropped renderd_processed.graph_category renderd renderd_processed.graph_info Displays the number of metatiles being rendered by renderd per ${graph_period} - renderd_processed.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.req", @renderers %> + renderd_processed.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.reqPrio", @renderers %> + renderd_processed.reqPrio.label Priority request Queue + renderd_processed.reqPrio.draw AREA + renderd_processed.reqPrio.info Throughput of Metatiles submitted high priority for on the fly rendering + renderd_processed.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.req", @renderers %> renderd_processed.req.label Request Queue - renderd_processed.req.draw AREA + renderd_processed.req.draw STACK renderd_processed.req.info Throughput of Metatiles submitted for on the fly rendering - renderd_processed.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.reqLow", @renderers %> + renderd_processed.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.reqLow", @renderers %> renderd_processed.reqLow.label Low priority request Queue renderd_processed.reqLow.draw STACK renderd_processed.reqLow.info Throughput of Metatiles submitted low priority for on the fly rendering - renderd_processed.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.reqPrio", @renderers %> - renderd_processed.reqPrio.label Priority request Queue - renderd_processed.reqPrio.draw STACK - renderd_processed.reqPrio.info Throughput of Metatiles submitted high priority for on the fly rendering - renderd_processed.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.dirty", @renderers %> + renderd_processed.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.dirty", @renderers %> renderd_processed.dirty.label Dirty Queue renderd_processed.dirty.draw STACK renderd_processed.dirty.info Throughput of dirty Metatiles submitted for re-render - renderd_processed.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.reqBulk", @renderers %> + renderd_processed.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.reqBulk", @renderers %> renderd_processed.reqBulk.label Bulk request Queue renderd_processed.reqBulk.draw STACK renderd_processed.reqBulk.info Throughput of Metatiles submitted with background priority - renderd_processed.dropped.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.dropped", @renderers %> + renderd_processed.dropped.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_processed.dropped", @renderers %> renderd_processed.dropped.label Dropped (x20) renderd_processed.dropped.draw LINE2 renderd_processed.dropped.info Number of Tiles dropped due to queue overload (x20) @@ -589,27 +694,27 @@ unknown_limit 144 renderd_zoom.graph_order z1 z2 z3 z4 z5 z6 renderd_zoom.graph_category renderd renderd_zoom.graph_info Displays the number of metatiles being rendered by renderd per ${graph_period} - renderd_zoom.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z1", @renderers %> + renderd_zoom.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z1", @renderers %> renderd_zoom.z1.label zoom z0 - z8 renderd_zoom.z1.draw AREA renderd_zoom.z1.info Throughput of Metatiles for z0 - z8 - renderd_zoom.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z2", @renderers %> + renderd_zoom.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z2", @renderers %> renderd_zoom.z2.label zoom z9 - z12 renderd_zoom.z2.draw STACK renderd_zoom.z2.info Throughput of Metatiles for z9 - z12 - renderd_zoom.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z3", @renderers %> + renderd_zoom.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z3", @renderers %> renderd_zoom.z3.label zoom z13 - z14 renderd_zoom.z3.draw STACK renderd_zoom.z3.info Throughput of Metatiles for z13 - z14 - renderd_zoom.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z4", @renderers %> + renderd_zoom.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z4", @renderers %> renderd_zoom.z4.label zoom z15 - z16 renderd_zoom.z4.draw STACK renderd_zoom.z4.info Throughput of Metatiles for z15 - z16 - renderd_zoom.z5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z5", @renderers %> + renderd_zoom.z5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z5", @renderers %> renderd_zoom.z5.label zoom z17 - z18 renderd_zoom.z5.draw STACK renderd_zoom.z5.info Throughput of Metatiles for z17 - z18 - renderd_zoom.z6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom.z6", @renderers %> + renderd_zoom.z6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom.z6", @renderers %> renderd_zoom.z6.label zoom z19 - z20 renderd_zoom.z6.draw STACK renderd_zoom.z6.info Throughput of Metatiles for z19 - z20 @@ -618,27 +723,27 @@ unknown_limit 144 renderd_queue_time.graph_vlabel metatiles renderd_queue_time.graph_order reqPrio req reqLow dirty reqBulk renderd_queue_time.graph_category renderd - renderd_queue_time.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue_time.reqPrio", @renderers %> + renderd_queue_time.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue_time.reqPrio", @renderers %> renderd_queue_time.reqPrio.label Priority request queue renderd_queue_time.reqPrio.cdef reqPrio,1000,/ renderd_queue_time.reqPrio.draw AREA renderd_queue_time.reqPrio.info Time for priority request queue - renderd_queue_time.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue_time.req", @renderers %> + renderd_queue_time.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue_time.req", @renderers %> renderd_queue_time.req.label Request queue renderd_queue_time.req.cdef req,1000,/ renderd_queue_time.req.draw STACK renderd_queue_time.req.info Time for Request queue - renderd_queue_time.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue_time.reqLow", @renderers %> + renderd_queue_time.reqLow.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue_time.reqLow", @renderers %> renderd_queue_time.reqLow.label Low priority request queue renderd_queue_time.reqLow.cdef reqLow,1000,/ renderd_queue_time.reqLow.draw STACK renderd_queue_time.reqLow.info Time for low priority request queue - renderd_queue_time.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue_time.dirty", @renderers %> + renderd_queue_time.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue_time.dirty", @renderers %> renderd_queue_time.dirty.label Dirty queue renderd_queue_time.dirty.cdef dirty,1000,/ renderd_queue_time.dirty.draw STACK renderd_queue_time.dirty.info Time for dirty queue - renderd_queue_time.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_queue_time.reqBulk", @renderers %> + renderd_queue_time.reqBulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_queue_time.reqBulk", @renderers %> renderd_queue_time.reqBulk.label Bulk queue renderd_queue_time.reqBulk.cdef reqBulk,1000,/ renderd_queue_time.reqBulk.draw STACK @@ -649,58 +754,60 @@ unknown_limit 144 renderd_zoom_time.graph_order zoomtime1 zoomtime2 zoomtime3 zoomtime4 zoomtime5 zoomtime6 renderd_zoom_time.graph_category renderd renderd_zoom_time.graph_info Displays the amount of time renderd has spent rendering tiles of a given zoom per ${graph_period} - renderd_zoom_time.zoomtime1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime1", @renderers %> + renderd_zoom_time.zoomtime1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime1", @renderers %> renderd_zoom_time.zoomtime1.label zoom z0 - z8 renderd_zoom_time.zoomtime1.cdef zoomtime1,1000,/ renderd_zoom_time.zoomtime1.draw AREA renderd_zoom_time.zoomtime1.info Time for Metatiles z0 - z8 - renderd_zoom_time.zoomtime2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime2", @renderers %> + renderd_zoom_time.zoomtime2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime2", @renderers %> renderd_zoom_time.zoomtime2.label zoom z9 - z12 renderd_zoom_time.zoomtime2.cdef zoomtime2,1000,/ renderd_zoom_time.zoomtime2.draw STACK renderd_zoom_time.zoomtime2.info Time for Metatiles for z9 - z12 - renderd_zoom_time.zoomtime3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime3", @renderers %> + renderd_zoom_time.zoomtime3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime3", @renderers %> renderd_zoom_time.zoomtime3.label zoom z13 - z14 renderd_zoom_time.zoomtime3.cdef zoomtime3,1000,/ renderd_zoom_time.zoomtime3.draw STACK renderd_zoom_time.zoomtime3.info Time for Metatiles for z13 - z14 - renderd_zoom_time.zoomtime4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime4", @renderers %> + renderd_zoom_time.zoomtime4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime4", @renderers %> renderd_zoom_time.zoomtime4.label zoom z15 - z16 renderd_zoom_time.zoomtime4.cdef zoomtime4,1000,/ renderd_zoom_time.zoomtime4.draw STACK renderd_zoom_time.zoomtime4.info Time for Metatiles for z15 - z16 - renderd_zoom_time.zoomtime5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime5", @renderers %> + renderd_zoom_time.zoomtime5.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime5", @renderers %> renderd_zoom_time.zoomtime5.label zoom z17 - z18 renderd_zoom_time.zoomtime5.cdef zoomtime5,1000,/ renderd_zoom_time.zoomtime5.draw STACK renderd_zoom_time.zoomtime5.info Time for Metatiles for z17 - z18 - renderd_zoom_time.zoomtime6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_zoom_time.zoomtime6", @renderers %> + renderd_zoom_time.zoomtime6.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:renderd_zoom_time.zoomtime6", @renderers %> renderd_zoom_time.zoomtime6.label zoom z19 - z20 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] +[nominatim.openstreetmap.org] 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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:nominatim_requests.z4", @geocoders %> nominatim_requests.z4.label details nominatim_requests.z4.draw STACK nominatim_requests.z4.type GAUGE @@ -709,11 +816,12 @@ unknown_limit 144 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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org: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.sum <%= Chef::Munin.expand "%%name%%.openstreetmap.org:nominatim_throttled_ips.block", @geocoders %> nominatim_throttled_ips.block.label blocked nominatim_throttled_ips.block.draw STACK nominatim_throttled_ips.block.type GAUGE +<% end -%>