X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9cb89866d2aea9415aaebc184a5ffd5c467899d5..eb15b15aae4c6f83fcc917214d33458052ae248a:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index e709545ad..818561930 100644 --- 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[ @@ -76,8 +77,10 @@ systemd_service "taginfo-update@" do exec_start "/srv/%i/bin/update" user "taginfo" sandbox :enable_network => true + restrict_address_families "AF_UNIX" read_write_paths [ "/srv/%i/data", + "/srv/%i/download", "/srv/%i/sources", "/var/log/taginfo/%i" ] @@ -159,7 +162,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 chronology" + settings["sources"]["create"] = "db languages projects wiki wikidata chronology" 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" @@ -217,4 +220,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