X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a661370166bbac0bbe8c8b1f0ba947e3a269edee..bafa182ae52808497be57f2297f216faf4d9440d:/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 1b1d54323..1e4e75f8b 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -309,7 +309,7 @@ unknown_limit 144
     network_out.<%= tc[:name].tr("-", "_") %>.cdef <%= tc[:name].tr("-", "_") %>,8,*
     network_out.<%= tc[:name].tr("-", "_") %>.draw AREASTACK
 <% end -%>
-    squid_delay_pools.graph_title IPs being delayed
+    squid_delay_pools.graph_title IPs being delayed with referer
     squid_delay_pools.graph_args --base 1000 -l 0
     squid_delay_pools.graph_vlabel IPs
     squid_delay_pools.graph_order squid_delay1
@@ -318,6 +318,15 @@ unknown_limit 144
     squid_delay_pools.squid_delay1.label IPs
     squid_delay_pools.squid_delay1.min 0
     squid_delay_pools.squid_delay1.draw AREA
+    squid_delay_pools_noreferer.graph_title No-referer IPs being delayed
+    squid_delay_pools_noreferer.graph_args --base 1000 -l 0
+    squid_delay_pools_noreferer.graph_vlabel IPs
+    squid_delay_pools_noreferer.graph_order squid_delay2
+    squid_delay_pools_noreferer.graph_category squid
+    squid_delay_pools_noreferer.squid_delay2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_delay_pools_noreferer.squid_delay2", @tilecaches %>
+    squid_delay_pools_noreferer.squid_delay2.label IPs
+    squid_delay_pools_noreferer.squid_delay2.min 0
+    squid_delay_pools_noreferer.squid_delay2.draw AREA
     squid_requests.graph_title Squid client requests
     squid_requests.graph_args --base 1000 -l 0
     squid_requests.graph_vlabel requests / ${graph_period}
@@ -332,6 +341,7 @@ unknown_limit 144
     squid_requests.errors.draw STACK
     squid_requests.requests.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_requests.requests", @tilecaches %>
     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
@@ -395,6 +405,28 @@ unknown_limit 144
 <% @tilecaches.each do |tc| -%>
     squid_times_dnsl.<%= tc[:name].tr("-", "_") %>.label <%= tc[:name] %>
 <% end -%>
+    squid_request_hitrates.graph_title Squid Cache Request Hit Rates
+    squid_request_hitrates.graph_category squid
+    squid_request_hitrates.graph_args --lower-limit 0 --upper-limit 100
+    squid_request_hitrates.graph_vlabel %
+    squid_request_hitrates.graph_order <%= Chef::Munin.expand "%%%name%%%_total=%%name%%.openstreetmap:squid_requests.requests %%%name%%%_hits=%%name%%.openstreetmap:squid_requests.hits", @tilecaches %>
+<% @tilecaches.each do |tc| -%>
+    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_total.graph no
+    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.cdef <%= tc[:name].tr("-", "_") %>_hits,<%= tc[:name].tr("-", "_") %>_total,/,100,*
+    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %>
+    squid_request_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1
+<% end -%>
+    squid_byte_hitrates.graph_title Squid Cache Byte Hit Rates
+    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_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,*
+    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.label <%= tc[:name] %>
+    squid_byte_hitrates.<%= tc[:name].tr("-", "_") %>_hits.draw LINE1
+<% end -%>
 
 # Configure compound graphs for render.openstreetmap.org
 [render.openstreetmap]