From ab030982c79d78db0a655e0fe056ada47e5e2b55 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 14 Aug 2016 22:21:33 +0100 Subject: [PATCH] Update combined tilecache graphs for delay pool changes --- cookbooks/munin/templates/default/munin.conf.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb index 1b1d54323..5134e6da1 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} -- 2.43.2