From 8c80f28569d1852809e9d5d994bcce9142aa76b5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 1 Oct 2015 21:41:59 +0100 Subject: [PATCH] Add some composite munin graphs for nominatim --- cookbooks/munin/recipes/server.rb | 8 +- .../munin/templates/default/munin.conf.erb | 76 +++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index c30078b82..3b71eaf10 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -54,13 +54,19 @@ end renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } end +geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| + { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } +end template "/etc/munin/munin.conf" do source "munin.conf.erb" owner "root" group "root" mode 0644 - variables :expiry_time => expiry_time, :clients => clients, :frontends => frontends, :backends => backends, :tilecaches => tilecaches, :renderers => renderers + variables :expiry_time => expiry_time, :clients => clients, + :frontends => frontends, :backends => backends, + :tilecaches => tilecaches, :renderers => renderers, + :geocoders => geocoders end apache_module "fcgid" diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb index bf37514c9..7c9e149e8 100644 --- a/cookbooks/munin/templates/default/munin.conf.erb +++ b/cookbooks/munin/templates/default/munin.conf.erb @@ -645,3 +645,79 @@ 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 + +# Configure compound graphs for nominatim.openstreetmap.org +[nominatim.openstreetmap] + update no + apache_accesses.graph_title Apache accesses + apache_accesses.graph_vlabel accesses / ${graph_period} + apache_accesses.graph_category apache + apache_accesses.graph_order <%= Chef::Munin.expand "%%name%%=%%name%%.openstreetmap:apache_accesses.accesses80", @geocoders %> + apache_accesses.graph_total total +<% @geocoders.each do |rs| -%> + apache_accesses.<%= rs[:name] %>.label <%= rs[:name] %> + apache_accesses.<%= rs[:name] %>.draw AREASTACK +<% 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", @geocoders %> + apache_volume.graph_total total +<% @geocoders.each do |rs| -%> + apache_volume.<%= rs[:name] %>.label <%= rs[:name] %> + apache_volume.<%= rs[:name] %>.draw AREASTACK +<% 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", @geocoders %> + network_in.graph_total total +<% @geocoders.each do |rs| -%> + network_in.<%= rs[:name] %>.label <%= rs[:name] %> + network_in.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,* + network_in.<%= rs[:name] %>.draw AREASTACK +<% 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", @geocoders %> + network_out.graph_total total +<% @geocoders.each do |rs| -%> + network_out.<%= rs[:name] %>.label <%= rs[:name] %> + network_out.<%= rs[:name] %>.cdef <%= rs[:name] %>,8,* + network_out.<%= rs[:name] %>.draw AREASTACK +<% end -%> + nominatim_requests.graph_title Requests by API call + nominatim_requests.graph_args --base 1000 -l 0 + nominatim_requests.graph_vlabel requests per minute + nominatim_requests.graph_category nominatim + nominatim_requests.graph_order z1 z2 z3 z4 + nominatim_requests.z1.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z1", @geocoders %> + nominatim_requests.z1.label reverse + nominatim_requests.z1.draw AREA + nominatim_requests.z1.type GAUGE + nominatim_requests.z2.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z2", @geocoders %> + nominatim_requests.z2.label search (successful) + nominatim_requests.z2.draw STACK + nominatim_requests.z2.type GAUGE + nominatim_requests.z3.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z3", @geocoders %> + nominatim_requests.z3.label search (no result) + nominatim_requests.z3.draw STACK + nominatim_requests.z3.type GAUGE + nominatim_requests.z4.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_requests.z4", @geocoders %> + nominatim_requests.z4.label details + nominatim_requests.z4.draw STACK + nominatim_requests.z4.type GAUGE + nominatim_throttled_ips.graph_title Restricted IPs + nominatim_throttled_ips.graph_args -l 0 + nominatim_throttled_ips.graph_vlabel number of IPs + nominatim_throttled_ips.graph_category nominatim + nominatim_throttled_ips.graph_order bulk block + nominatim_throttled_ips.bulk.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_throttled_ips.bulk", @geocoders %> + nominatim_throttled_ips.bulk.label bulk + nominatim_throttled_ips.bulk.draw AREA + nominatim_throttled_ips.bulk.type GAUGE + nominatim_throttled_ips.block.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:nominatim_throttled_ips.block", @geocoders %> + nominatim_throttled_ips.block.label blocked + nominatim_throttled_ips.block.draw STACK + nominatim_throttled_ips.block.type GAUGE -- 2.39.5