X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dab49e324ed9791aa28e09d97b4023a8a398cb06..255a305b676d38d17d0fdab56d922b32319854fa:/cookbooks/prometheus/resources/exporter.rb?ds=sidebyside

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 5eca43f5c..e1f56b09c 100644
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true
@@ -34,6 +36,8 @@ property :register_target, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   systemd_service service_name do
+    after "network-online.target"
+    wants "network-online.target"
     description "Prometheus #{new_resource.exporter} exporter"
     type "simple"
     user new_resource.user
@@ -59,6 +63,8 @@ action :create do
     only_if { node[:prometheus][:mode] == "external" }
   end
 
+  node.default[:prometheus][:addresses][new_resource.exporter] = listen_address
+
   if new_resource.register_target
     node.default[:prometheus][:exporters][new_resource.port] = {
       :name => new_resource.exporter,
@@ -81,6 +87,7 @@ end
 action :restart do
   service service_name do
     action :restart
+    only_if { service_exists? }
   end
 end
 
@@ -93,8 +100,12 @@ action_class do
     end
   end
 
+  def service_exists?
+    ::File.exist?("/etc/systemd/system/#{service_name}.service")
+  end
+
   def executable_path
-    "/opt/prometheus/exporters/#{new_resource.exporter}/#{new_resource.exporter}_exporter"
+    "/opt/prometheus-exporters/exporters/#{new_resource.exporter}/#{new_resource.exporter}_exporter"
   end
 
   def executable_options
@@ -120,5 +131,5 @@ action_class do
 end
 
 def after_created
-  subscribes :restart, "git[/opt/prometheus]"
+  subscribes :restart, "git[/opt/prometheus-exporters]"
 end