Don't try and fallback to alternate caches

[chef.git] / 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 1e4e75f8bf2bef86ca13f946e519017795ca7876..6b08b07fecee040df2b3327359f78c080cb9efb8 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -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][: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 -%>
 <% if client[:munin][:plugins][plugin][value][:label] -%>
     <%= plugin %>.<%= value %>.label <%= client[:munin][:plugins][plugin][value][:label] %>
 <% end -%>


@@ -86,6 +89,7 @@ unknown_limit 144
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>

+<% unless @frontends.empty? && @backends.empty? -%>

 
 # Configure compound graphs for www.openstreetmap.org
 [www.openstreetmap]
 
 # Configure compound graphs for www.openstreetmap.org
 [www.openstreetmap]


@@ -93,13 +97,17 @@ unknown_limit 144
     apache_accesses.graph_title Apache accesses
     apache_accesses.graph_vlabel accesses / ${graph_period}
     apache_accesses.graph_category apache
     apache_accesses.graph_title Apache accesses
     apache_accesses.graph_vlabel accesses / ${graph_period}
     apache_accesses.graph_category apache

+    apache_accesses.graph_args --lower-limit 0

     apache_accesses.accesses80.sum <%= Chef::Munin.expand "%%.openstreetmap:apache_accesses.accesses80", @frontends %>
     apache_accesses.accesses80.label port 80
     apache_accesses.accesses80.sum <%= Chef::Munin.expand "%%.openstreetmap: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.graph_title Apache volume
     apache_volume.graph_vlabel bytes per ${graph_period}
     apache_volume.graph_category apache

+    apache_volume.graph_args --lower-limit 0

     apache_volume.volume80.sum <%= Chef::Munin.expand "%%.openstreetmap:apache_volume.volume80", @frontends %>
     apache_volume.volume80.label port 80
     apache_volume.volume80.sum <%= Chef::Munin.expand "%%.openstreetmap:apache_volume.volume80", @frontends %>
     apache_volume.volume80.label port 80

+    apache_volume.volume80.min 0

     if_eth0.graph_title eth0 traffic
     if_eth0.graph_vlabel bits in (-) / out (+) per ${graph_period}
     if_eth0.graph_category network
     if_eth0.graph_title eth0 traffic
     if_eth0.graph_vlabel bits in (-) / out (+) per ${graph_period}
     if_eth0.graph_category network


@@ -143,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_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.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
     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


@@ -285,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,*
     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]
 
 # Configure compound graphs for tile.openstreetmap.org
 [tile.openstreetmap]


@@ -294,20 +307,24 @@ unknown_limit 144
     network_in.graph_category network
     network_in.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:if_%%interface%%.down", @tilecaches %>
     network_in.graph_total total
     network_in.graph_category network
     network_in.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap: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
 <% @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_total total
 <% 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_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
 <% @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
 <% end -%>
     squid_delay_pools.graph_title IPs being delayed with referer
     squid_delay_pools.graph_args --base 1000 -l 0


@@ -330,18 +347,22 @@ unknown_limit 144
     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_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:squid_requests.hits %%%name%%%_errors=%%name%%.openstreetmap:squid_requests.errors %%%name%%%_requests=%%name%%.openstreetmap:squid_requests.requests", @tilecaches %> hits=<%= @tilecaches.first[:name] %>.openstreetmap:squid_requests.hits errors=<%= @tilecaches.first[:name] %>.openstreetmap:squid_requests.errors requests=<%= @tilecaches.first[:name] %>.openstreetmap:squid_requests.requests

     squid_requests.graph_total total
     squid_requests.graph_category squid
     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.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.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.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_requests.requests.draw STACK
     squid_traffic.graph_title Squid traffic status
     squid_traffic.graph_args --base 1000


@@ -427,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 -%>
     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]
 
 # Configure compound graphs for render.openstreetmap.org
 [render.openstreetmap]


@@ -436,38 +459,46 @@ unknown_limit 144
     apache_accesses.graph_category apache
     apache_accesses.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap:apache_accesses.accesses80", @renderers %>
     apache_accesses.graph_total total
     apache_accesses.graph_category apache
     apache_accesses.graph_order <%= Chef::Munin.expand "%%%name%%%=%%name%%.openstreetmap: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
 <% @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_total total
 <% 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_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
 <% @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_total total
 <% 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_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
 <% @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_total total
 <% 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_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
 <% @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
 <% end -%>
     mod_tile_fresh.graph_title freshness of served tiles
     mod_tile_fresh.graph_args --base 1000 -l 0


@@ -555,21 +586,21 @@ unknown_limit 144
     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_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.graph_category renderd
     renderd_processed.graph_info Displays the number of metatiles being rendered by renderd per ${graph_period}

+    renderd_processed.reqPrio.sum <%= Chef::Munin.expand "%%name%%.openstreetmap: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:renderd_processed.req", @renderers %>
     renderd_processed.req.label Request Queue
     renderd_processed.req.sum <%= Chef::Munin.expand "%%name%%.openstreetmap: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.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.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.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.label Dirty Queue
     renderd_processed.dirty.draw STACK
     renderd_processed.dirty.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:renderd_processed.dirty", @renderers %>
     renderd_processed.dirty.label Dirty Queue
     renderd_processed.dirty.draw STACK


@@ -679,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
     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]
 
 # Configure compound graphs for nominatim.openstreetmap.org
 [nominatim.openstreetmap]


@@ -717,3 +750,4 @@ unknown_limit 144
     nominatim_throttled_ips.block.label blocked
     nominatim_throttled_ips.block.draw STACK
     nominatim_throttled_ips.block.type GAUGE
     nominatim_throttled_ips.block.label blocked
     nominatim_throttled_ips.block.draw STACK
     nominatim_throttled_ips.block.type GAUGE

+<% end -%>