Switch to using prometheus exporters for renderd and mod_tile

diff --git a/cookbooks/prometheus/resources/collector.rb b/cookbooks/prometheus/resources/collector.rb
index dc9c995a047a1304dfc87416d5e65506d11bd196..c9c28fc6e8046d5c9ce74b3915e48da1a7ab882e 100644 (file)
--- a/cookbooks/prometheus/resources/collector.rb
+++ b/cookbooks/prometheus/resources/collector.rb
@@ -64,6 +64,10 @@ action :delete do
   systemd_service service_name do
     action :delete
   end
+
+  file "/var/lib/prometheus/node-exporter/#{new_resource.collector}.prom" do
+    action :delete
+  end
 end
 
 action_class do

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 154ce68fd50facaae76a71f654e78c0a265054f7..a52c0aa66039e205b1fd8e59a84a31cf368d0e1a 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -611,9 +611,17 @@ munin_plugin "renderd_zoom_time"
 munin_plugin "replication_delay"
 
 prometheus_collector "modtile" do
-  interval "1m"
+  action :delete
 end
 
 prometheus_collector "renderd" do
-  interval "1m"
+  action :delete
+end
+
+prometheus_exporter "modtile" do
+  port 9494
+end
+
+prometheus_exporter "renderd" do
+  port 9393
 end