X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/de16319004d8f13f3baba7dbe2e35dcf4bbebfa9..beb8b02aa361eaa281949b30e2f54a95e0b0c489:/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 3fed5baf2..271d0c3e1 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -34,7 +34,7 @@ unknown_limit 144
 <% 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 -%>
@@ -86,6 +89,7 @@ unknown_limit 144
 <% end -%>
 <% end -%>
 <% end -%>
+<% unless @frontends.empty? && @backends.empty? -%>
 
 # Configure compound graphs for www.openstreetmap.org
 [www.openstreetmap]
@@ -147,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
@@ -289,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]
@@ -439,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]
@@ -578,18 +589,18 @@ unknown_limit 144
     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
@@ -699,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]
@@ -737,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 -%>