nominatim: have munin plugins use file-based query logs

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 65da50c5456cfbe628451563ad2381255f042501..2f1f7463ae6b8282433683e00be419d175af2a2d 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -243,11 +243,11 @@ munin_plugin "nominatim_importlag" do
 end
 
 munin_plugin "nominatim_query_speed" do
-  target "#{source_directory}/munin/nominatim_query_speed"
+  target "#{source_directory}/munin/nominatim_query_speed_querylog"
 end
 
 munin_plugin "nominatim_requests" do
-  target "#{source_directory}/munin/nominatim_requests"
+  target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 
 munin_plugin "nominatim_throttled_ips" do

diff --git a/cookbooks/nominatim/templates/default/munin.erb b/cookbooks/nominatim/templates/default/munin.erb
index 62f4201437f2a33b28b710edd53e62bd60386bff..136211ef5731c31de7402cf5d9629c2a99c6bd1a 100644 (file)
--- a/cookbooks/nominatim/templates/default/munin.erb
+++ b/cookbooks/nominatim/templates/default/munin.erb
@@ -4,3 +4,4 @@
 user www-data
 env.PGDATABASE <%= node[:nominatim][:database][:dbname] %>
 env.PGUSER www-data
+env.NOMINATIM_QUERYLOG /var/log/nominatim/query.log