Rework squid compound requests graph

[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 ba642826b7d1bec8978760d1e91b78bc34c7a30d..10766851cbb2b174849ff39e8ff8e93b8afc8e16 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -330,18 +330,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_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 errors 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
@@ -420,7 +424,7 @@ 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:squid_traffic.kbytes_out %%%name%%%_hits=%%name%%.openstreetmap: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,*