nominatim: avoid double slash in mapicon URL

[chef.git] / cookbooks / prometheus / recipes / server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 382fc7f21befbe001649577edd4e405e2fac4cdd..763c7fa217cc6046a346027a7de28b44100968af 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -24,6 +24,7 @@ include_recipe "timescaledb"
 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")
 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")

+admins = data_bag_item("apache", "admins")

 
 prometheus_exporter "fastly" do
   port 8080
 
 prometheus_exporter "fastly" do
   port 8080


@@ -32,15 +33,82 @@ prometheus_exporter "fastly" do
   environment "FASTLY_API_TOKEN" => tokens["fastly"]
 end
 
   environment "FASTLY_API_TOKEN" => tokens["fastly"]
 end
 

-package %w[
+cache_dir = Chef::Config[:file_cache_path]
+
+prometheus_version = "2.31.1"
+alertmanager_version = "0.23.0"
+karma_version = "0.93"
+
+directory "/opt/prometheus-server" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+remote_file "#{cache_dir}/prometheus.linux-amd64.tar.gz" do
+  source "https://github.com/prometheus/prometheus/releases/download/v#{prometheus_version}/prometheus-#{prometheus_version}.linux-amd64.tar.gz"
+  owner "root"
+  group "root"
+  mode "644"
+  backup false
+end
+
+archive_file "#{cache_dir}/prometheus.linux-amd64.tar.gz" do
+  action :nothing
+  destination "/opt/prometheus-server/prometheus"
+  overwrite true
+  strip_components 1
+  owner "root"
+  group "root"
+  subscribes :extract, "remote_file[#{cache_dir}/prometheus.linux-amd64.tar.gz]"
+end
+
+remote_file "#{cache_dir}/alertmanager.linux-amd64.tar.gz" do
+  source "https://github.com/prometheus/alertmanager/releases/download/v#{alertmanager_version}/alertmanager-#{alertmanager_version}.linux-amd64.tar.gz"
+  owner "root"
+  group "root"
+  mode "644"
+  backup false
+end
+
+archive_file "#{cache_dir}/alertmanager.linux-amd64.tar.gz" do
+  action :nothing
+  destination "/opt/prometheus-server/alertmanager"
+  overwrite true
+  strip_components 1
+  owner "root"
+  group "root"
+  subscribes :extract, "remote_file[#{cache_dir}/alertmanager.linux-amd64.tar.gz]"
+end
+
+remote_file "#{cache_dir}/karma-linux-amd64.tar.gz" do
+  source "https://github.com/prymitive/karma/releases/download/v#{karma_version}/karma-linux-amd64.tar.gz"
+  owner "root"
+  group "root"
+  mode "644"
+  backup false
+end
+
+archive_file "#{cache_dir}/karma-linux-amd64.tar.gz" do
+  action :nothing
+  destination "/opt/prometheus-server/karma"
+  overwrite true
+  owner "root"
+  group "root"
+  subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
+end
+
+promscale_version = "0.11.0"
+
+database_version = node[:timescaledb][:database_version]
+database_cluster = "#{database_version}/main"
+
+package %W[

   prometheus
   prometheus-alertmanager
   prometheus
   prometheus-alertmanager

+  promscale-extension-postgresql-#{database_version}

 ]
 
 ]
 

-promscale_version = "0.2.0"
-
-database_cluster = "#{node[:timescaledb][:database_version]}/main"
-

 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true
 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true


@@ -57,32 +125,6 @@ directory "/opt/promscale" do
   mode "755"
 end
 
   mode "755"
 end
 

-package %w[
-  make
-  gcc
-  clang-9
-  llvm-9
-  cargo
-]
-
-git "/opt/promscale/extension" do
-  action :sync
-  repository "https://github.com/timescale/promscale_extension.git"
-  revision "0.1.1"
-  user "root"
-  group "root"
-end
-
-execute "/opt/promscale/extension/Makefile" do
-  action :nothing
-  command "make install"
-  cwd "/opt/promscale/extension"
-  user "root"
-  group "root"
-  subscribes :run, "git[/opt/promscale/extension]", :immediately
-  notifies :restart, "service[postgresql]", :immediately
-end
-

 directory "/opt/promscale/bin" do
   owner "root"
   group "root"
 directory "/opt/promscale/bin" do
   owner "root"
   group "root"


@@ -101,8 +143,7 @@ systemd_service "promscale" do
   description "Promscale Connector"
   type "simple"
   user "prometheus"
   description "Promscale Connector"
   type "simple"
   user "prometheus"

-  exec_start "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port 5432 --db-user prometheus --db-name promscale --db-connections-max 400"
-  # exec_start lazy { "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port #{node[:postgresql][:clusters][database_cluster][:port]} --db-user prometheus --db-name promscale --db-max-connections 400" }
+  exec_start "/opt/promscale/bin/promscale --db.uri postgresql:///promscale?host=/run/postgresql&port=5432 --db.connections-max 400"

   limit_nofile 16384
   private_tmp true
   protect_system "strict"
   limit_nofile 16384
   private_tmp true
   protect_system "strict"


@@ -110,31 +151,16 @@ systemd_service "promscale" do
   no_new_privileges true
 end
 
   no_new_privileges true
 end
 

-service "promscale" do
-  action [:enable, :start]
-  subscribes :restart, "remote_file[/opt/promscale/bin/promscale]"
-  subscribes :restart, "systemd_service[promscale]"
-end
-
-systemd_service "promscale-maintenance" do
-  description "Promscale Maintenace"
-  type "simple"
-  user "prometheus"
-  exec_start "/usr/bin/psql --command='CALL prom_api.execute_maintenance()' promscale"
-  private_tmp true
-  protect_system "strict"
-  protect_home true
-  no_new_privileges true
-end
-
-systemd_timer "promscale-maintenance" do
-  description "Promscale Maintenace"
-  on_active_sec 1800
-  on_unit_inactive_sec 1800
-end
-
-service "promscale-maintenance.timer" do
-  action [:enable, :start]
+if node[:prometheus][:promscale]
+  service "promscale" do
+    action [:enable, :start]
+    subscribes :restart, "remote_file[/opt/promscale/bin/promscale]"
+    subscribes :restart, "systemd_service[promscale]"
+  end
+else
+  service "promscale" do
+    action [:disable, :stop]
+  end

 end
 
 search(:node, "roles:gateway") do |gateway|
 end
 
 search(:node, "roles:gateway") do |gateway|


@@ -165,16 +191,19 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
     if exporter.is_a?(Hash)
       name = exporter[:name]
       address = exporter[:address]
     if exporter.is_a?(Hash)
       name = exporter[:name]
       address = exporter[:address]

+      sni = exporter[:sni]

       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter

+      sni = nil

       metric_relabel = []
     end
 
     jobs[name] ||= []
     jobs[name] << {
       :address => address,
       metric_relabel = []
     end
 
     jobs[name] ||= []
     jobs[name] << {
       :address => address,

+      :sni => sni,

       :instance => client.name.split(".").first,
       :metric_relabel => metric_relabel
     }
       :instance => client.name.split(".").first,
       :metric_relabel => metric_relabel
     }


@@ -217,11 +246,11 @@ prometheus_exporter "ssl" do
   register_target false
 end
 
   register_target false
 end
 

-template "/etc/default/prometheus" do
-  source "default.prometheus.erb"
-  owner "root"
-  group "root"
-  mode "644"
+systemd_service "prometheus-executable" do
+  service "prometheus"
+  dropin "executable"
+  exec_start "/opt/prometheus-server/prometheus/prometheus --config.file=/etc/prometheus/prometheus.yml --web.external-url=https://prometheus.openstreetmap.org/prometheus --storage.tsdb.path=/var/lib/prometheus/metrics2"
+  notifies :restart, "service[prometheus]"

 end
 
 template "/etc/prometheus/prometheus.yml" do
 end
 
 template "/etc/prometheus/prometheus.yml" do


@@ -241,16 +270,16 @@ end
 
 service "prometheus" do
   action [:enable, :start]
 
 service "prometheus" do
   action [:enable, :start]

-  subscribes :restart, "template[/etc/default/prometheus]"

   subscribes :reload, "template[/etc/prometheus/prometheus.yml]"
   subscribes :reload, "template[/etc/prometheus/alert_rules.yml]"
   subscribes :reload, "template[/etc/prometheus/prometheus.yml]"
   subscribes :reload, "template[/etc/prometheus/alert_rules.yml]"

+  subscribes :restart, "archive_file[#{cache_dir}/prometheus.linux-amd64.tar.gz]"

 end
 
 end
 

-template "/etc/default/prometheus-alertmanager" do
-  source "default.alertmanager.erb"
-  owner "root"
-  group "root"
-  mode "644"
+systemd_service "prometheus-alertmanager-executable" do
+  service "prometheus-alertmanager"
+  dropin "executable"
+  exec_start "/opt/prometheus-server/alertmanager/alertmanager --config.file=/etc/prometheus/alertmanager.yml --storage.path=/var/lib/prometheus/alertmanager --web.external-url=https://prometheus.openstreetmap.org/alertmanager"
+  notifies :restart, "service[prometheus-alertmanager]"

 end
 
 template "/etc/prometheus/alertmanager.yml" do
 end
 
 template "/etc/prometheus/alertmanager.yml" do


@@ -262,8 +291,8 @@ end
 
 service "prometheus-alertmanager" do
   action [:enable, :start]
 
 service "prometheus-alertmanager" do
   action [:enable, :start]

-  subscribes :restart, "template[/etc/default/prometheus-alertmanager]"

   subscribes :reload, "template[/etc/prometheus/alertmanager.yml]"
   subscribes :reload, "template[/etc/prometheus/alertmanager.yml]"

+  subscribes :restart, "archive_file[#{cache_dir}/alertmanager.linux-amd64.tar.gz]"

 end
 
 template "/etc/prometheus/amtool.yml" do
 end
 
 template "/etc/prometheus/amtool.yml" do


@@ -273,6 +302,31 @@ template "/etc/prometheus/amtool.yml" do
   mode "644"
 end
 
   mode "644"
 end
 

+template "/etc/prometheus/karma.yml" do
+  source "karma.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+systemd_service "prometheus-karma" do
+  description "Alert dashboard for Prometheus Alertmanager"
+  user "prometheus"
+  exec_start "/opt/prometheus-server/karma/karma-linux-amd64 --config.file=/etc/prometheus/karma.yml"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
+end
+
+service "prometheus-karma" do
+  action [:enable, :start]
+  subscribes :reload, "template[/etc/prometheus/karma.yml]"
+  subscribes :restart, "archive_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
+end
+

 package "grafana-enterprise"
 
 template "/etc/grafana/grafana.ini" do
 package "grafana-enterprise"
 
 template "/etc/grafana/grafana.ini" do


@@ -298,6 +352,7 @@ end
 
 apache_site "prometheus.openstreetmap.org" do
   template "apache.erb"
 
 apache_site "prometheus.openstreetmap.org" do
   template "apache.erb"

+  variables :admin_hosts => admins["hosts"]

 end
 
 template "/etc/cron.daily/prometheus-backup" do
 end
 
 template "/etc/cron.daily/prometheus-backup" do