X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bb670c9eb8501639d3073dfa54c2d921ca8da5ee..7302041c3f2c05098816f4fd9e3e538811f25a4e:/cookbooks/prometheus/resources/exporter.rb?ds=sidebyside

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index bab318a4a..a69d940a0 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
@@ -83,6 +85,7 @@ end
 action :restart do
   service service_name do
     action :restart
+    only_if { service_exists? }
   end
 end
 
@@ -95,8 +98,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
@@ -122,5 +129,5 @@ action_class do
 end
 
 def after_created
-  subscribes :restart, "git[/opt/prometheus]"
+  subscribes :restart, "git[/opt/prometheus-exporters]"
 end