X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/391c47d0f9204e27d711c40bc23af693f22c99d2..2b821de7db794b94bb58f15038291e82c7dd8a3d:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 20275ab7a..18e0bc97c 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -34,11 +34,14 @@ end
 
 prometheus_exporter "fastly_healthcheck" do
   port 9696
+  scrape_interval "1m"
   environment "FASTLY_API_TOKEN" => tokens["fastly"]
 end
 
 prometheus_exporter "statuscake" do
   port 9595
+  scrape_interval "5m"
+  scrape_timeout "2m"
   environment "STATUSCAKE_APIKEY" => tokens["statuscake"]
 end
 
@@ -46,7 +49,7 @@ cache_dir = Chef::Config[:file_cache_path]
 
 prometheus_version = "2.31.1"
 alertmanager_version = "0.23.0"
-karma_version = "0.93"
+karma_version = "0.105"
 
 directory "/opt/prometheus-server" do
   owner "root"
@@ -107,7 +110,7 @@ archive_file "#{cache_dir}/karma-linux-amd64.tar.gz" do
   subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
 end
 
-promscale_version = "0.11.0"
+promscale_version = "0.13.0"
 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
@@ -201,11 +204,15 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       name = exporter[:name]
       address = exporter[:address]
       sni = exporter[:sni]
+      scrape_interval = exporter[:scrape_interval]
+      scrape_timeout = exporter[:scrape_timeout]
       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
       sni = nil
+      scrape_interval = nil
+      scrape_timeout = nil
       metric_relabel = []
     end
 
@@ -214,6 +221,8 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :address => address,
       :sni => sni,
       :instance => client.name.split(".").first,
+      :scrape_interval => scrape_interval,
+      :scrape_timeout => scrape_timeout,
       :metric_relabel => metric_relabel
     }
   end