X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b413a8a17bc14d4503fe4d6432223a5f45c5286e..677cb67550747f63b59463fecff652cd8d41fdff:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 2e23f2949..571c8fd32 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -20,6 +20,7 @@ include_recipe "accounts" include_recipe "munin" include_recipe "php::fpm" +include_recipe "prometheus" basedir = data_bag_item("accounts", "nominatim")["home"] email_errors = data_bag_item("accounts", "lonvia")["email"] @@ -165,6 +166,9 @@ package %w[ php-pgsql php-intl php-symfony-dotenv + ruby + ruby-file-tail + ruby-pg ] source_directory = "#{basedir}/nominatim" @@ -290,7 +294,7 @@ if node[:nominatim][:state] == "off" action :delete end - cron_d "nominatim-update-maintenance-trigger" do + systemd_timer "nominatim-update-maintenance-trigger" do action :delete end else @@ -321,12 +325,20 @@ else mailto email_errors end - cron_d "nominatim-update-maintenance-trigger" do - minute "18" - hour "1" + systemd_service "nominatim-update-maintenance-trigger" do + description "Trigger maintenance tasks for Nominatim DB" + exec_start "touch #{basedir}/status/update_maintenance" user "nominatim" - command "touch #{basedir}/status/update_maintenance" - mailto email_errors + end + + systemd_timer "nominatim-update-maintenance-trigger" do + action :create + description "Schedule maintenance tasks for Nominatim DB" + on_calendar "*-*-* 02:03:00 UTC" + end + + service "nominatim-update-maintenance-trigger" do + action [:enable] end end @@ -447,6 +459,15 @@ munin_plugin "nominatim_requests" do target "#{source_directory}/munin/nominatim_requests_querylog" end +prometheus_exporter "nominatim" do + port 8082 + user "www-data" + options [ + "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log", + "--nominatim.database-name=#{node[:nominatim][:dbname]}" + ] +end + directory "#{basedir}/status" do owner "nominatim" group "postgres"