X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/64dc1954afc995a97660dd35fb852586d17fff7d..dc7c507259804d72756728eb28fadd84adb87ff6:/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 c633fbc70..791007f98 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 -%>
@@ -93,13 +96,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
@@ -294,20 +301,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_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_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
@@ -440,38 +451,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_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,*
     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
+    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
@@ -559,21 +578,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