Merge remote-tracking branch 'github/pull/741'

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 613fe7d1dca2dc030210ee30099421833a8fda3c..729f92777b15265e98107b5f922f68e93b8817b7 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -24,6 +24,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "passenger"
 include_recipe "planet::current"
+include_recipe "prometheus"
 include_recipe "ruby"
 
 package %w[
@@ -83,6 +84,7 @@ systemd_service "taginfo-update@" do
     "/srv/%i/sources",
     "/var/log/taginfo/%i"
   ]
+  nice 10
 end
 
 systemd_timer "taginfo-update@" do
@@ -161,7 +163,7 @@ node[:taginfo][:sites].each do |site|
     settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
     settings["paths"]["bin_dir"] = "#{directory}/build/src"
     settings["sources"]["download"] = ""
-    settings["sources"]["create"] = "db languages projects wiki wikidata chronology"
+    settings["sources"]["create"] = "db languages projects wiki wikidata chronology sw"
     settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.osh.pbf"
     settings["sources"]["chronology"]["osm_history_file"] = "/var/lib/planet/planet.osh.pbf"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
@@ -177,10 +179,17 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "service[apache2]"
   end
 
+  bundle_config "#{directory}/taginfo" do
+    user "taginfo"
+    group "taginfo"
+    settings "deployment" => "true",
+             "without" => "development:test"
+  end
+
   bundle_install "#{directory}/taginfo" do
     action :nothing
-    user "root"
-    group "root"
+    user "taginfo"
+    group "taginfo"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "passenger_application[#{directory}/taginfo/web/public]"
   end
@@ -219,4 +228,11 @@ node[:taginfo][:sites].each do |site|
   service "taginfo-update@#{site_name}.timer" do
     action [:enable, :start]
   end
+
+  prometheus_collector "taginfo-#{site_name}" do
+    interval "15m"
+    user "taginfo"
+    path "#{directory}/taginfo/sources/metrics.rb"
+    options "#{directory}/data"
+  end
 end