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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 121b2e3c2066247cede60c3ba98fca1b6c0d6728..721cd6babd5cf3081909d7ebb595265d09214ee0 100644 (file)
--- 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 cb0dfb4a209d719c6e461584080bc110bcd212d6..f3c0dcb78d50ed173124ad2f6efd12431e52d546 100644 (file)
--- 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
+    ]
   }
 )