From: Tom Hughes <tom@compton.nu>
Date: Fri, 11 Nov 2022 19:00:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/546'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f8f64cbeff3122d4acc912647d26997f70c1f0fc?hp=a7888b95d5e1e41ee913e8106401054026e8bb5f

Merge remote-tracking branch 'github/pull/546'
---

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 121b2e3c2..721cd6bab 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -174,8 +174,8 @@ end
 
 prometheus_exporter "postgres" do
   port 9187
-  scrape_interval "30s"
-  scrape_timeout "30s"
+  scrape_interval "1m"
+  scrape_timeout "1m"
   user "postgres"
   options "--extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
   environment "DATA_SOURCE_URI" => uris.sort.uniq.first,
diff --git a/roles/overpass-query.rb b/roles/overpass-query.rb
index cb0dfb4a2..f3c0dcb78 100644
--- a/roles/overpass-query.rb
+++ b/roles/overpass-query.rb
@@ -16,6 +16,11 @@ default_attributes(
     :meta_mode => "no",
     :compression_mode => "no",
     :restricted_api => true
+  },
+  :prometheus => {
+    :files => %w[
+      /srv/query.openstreetmap.org/diffs/latest.osc
+    ]
   }
 )