X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/739dc3d86ae8d1f390bc8c927e0a4cd81dedc91b..bf16c782a9d8e78c4b14a35b899b81992f91155f:/cookbooks/munin/templates/default/munin.conf.erb

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index ef01e36f3..6b08b07fe 100644
--- 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][: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 -%>
@@ -86,6 +89,7 @@ unknown_limit 144
 <% end -%>
 <% end -%>
 <% end -%>
+<% unless @frontends.empty? && @backends.empty? -%>
 
 # 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_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.min 0
     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.min 0
     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_order http401 http500 http502 http503 http509
+    api_calls_error.graph_order http401 http422 http500 http502 http503 http509
     api_calls_error.http401.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http401", @frontends %>
     api_calls_error.http401.label 401 Unauthorized
     api_calls_error.http401.warning :0.5
+    api_calls_error.http422.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http422", @frontends %>
+    api_calls_error.http422.label 422 Unprocessable Entity
+    api_calls_error.http422.warning :0.5
     api_calls_error.http500.sum <%= Chef::Munin.expand "%%.openstreetmap:api_calls_status.http500", @frontends %>
     api_calls_error.http500.label 500 Internal Server Error
     api_calls_error.http500.warning :0.5
@@ -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,*
+<% end -%>
+<% unless @tilecaches.empty? -%>
 
 # Configure compound graphs for tile.openstreetmap.org
 [tile.openstreetmap]
@@ -294,6 +307,7 @@ 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_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,*
@@ -305,6 +319,7 @@ unknown_limit 144
     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,*
@@ -433,6 +448,8 @@ unknown_limit 144
     squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %>
     squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1
 <% end -%>
+<% end -%>
+<% unless @renderers.empty? -%>
 
 # Configure compound graphs for render.openstreetmap.org
 [render.openstreetmap]
@@ -442,24 +459,29 @@ 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_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_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_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,*
@@ -471,6 +493,7 @@ unknown_limit 144
     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,*
@@ -563,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_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.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.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.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
@@ -687,6 +710,8 @@ unknown_limit 144
     renderd_zoom_time.zoomtime6.cdef zoomtime6,1000,/
     renderd_zoom_time.zoomtime6.draw STACK
     renderd_zoom_time.zoomtime6.info Time for Metatiles for z19 - z20
+<% end -%>
+<% unless @geocoders.empty? -%>
 
 # Configure compound graphs for nominatim.openstreetmap.org
 [nominatim.openstreetmap]
@@ -725,3 +750,4 @@ unknown_limit 144
     nominatim_throttled_ips.block.label blocked
     nominatim_throttled_ips.block.draw STACK
     nominatim_throttled_ips.block.type GAUGE
+<% end -%>