Increase interval and timeout for statuscake monitoring

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 1556089265c5752a5c2d5f6bbe0eb21120fe845e..18e0bc97c08041f84597d157c3433cf4144f16f7 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -40,6 +40,8 @@ end
 
 prometheus_exporter "statuscake" do
   port 9595
+  scrape_interval "5m"
+  scrape_timeout "2m"
   environment "STATUSCAKE_APIKEY" => tokens["statuscake"]
 end
 
@@ -203,12 +205,14 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       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
 
@@ -218,6 +222,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :sni => sni,
       :instance => client.name.split(".").first,
       :scrape_interval => scrape_interval,
+      :scrape_timeout => scrape_timeout,
       :metric_relabel => metric_relabel
     }
   end

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 7ff729211b2738fae6a442c4ce1c9b7da8900357..c978f6c62e9bd0b7355778209cba10b149b22635 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -32,6 +32,7 @@ property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :service, :kind_of => String
 property :scrape_interval, :kind_of => String
+property :scrape_timeout, :kind_of => String
 property :metric_relabel, :kind_of => Array
 property :register_target, :kind_of => [TrueClass, FalseClass], :default => true
 
@@ -71,6 +72,7 @@ action :create do
       :name => new_resource.exporter,
       :address => listen_address,
       :scrape_interval => new_resource.scrape_interval,
+      :scrape_timeout => new_resource.scrape_timeout,
       :metric_relabel => new_resource.metric_relabel
     }
   end

diff --git a/cookbooks/prometheus/templates/default/prometheus.yml.erb b/cookbooks/prometheus/templates/default/prometheus.yml.erb
index 00f3c65dfe3aee54e243e6ca2342bf6c76e6b625..50a074eb1bcca240bfbd69ce3831274b0c0e32ea 100644 (file)
--- a/cookbooks/prometheus/templates/default/prometheus.yml.erb
+++ b/cookbooks/prometheus/templates/default/prometheus.yml.erb
@@ -60,6 +60,9 @@ scrape_configs:
 <% if targets.first[:scrape_interval] -%>
     scrape_interval: <%= targets.first[:scrape_interval] %>
 <% end -%>
+<% if targets.first[:scrape_timeout] -%>
+    scrape_timeout: <%= targets.first[:scrape_timeout] %>
+<% end -%>
 <% if targets.first[:sni] -%>
     tls_config:
       server_name: <%= targets.first[:sni] %>