prometheus: Fix Mac ARM compatibility (kitchen)

[chef.git] / cookbooks / prometheus / resources / exporter.rb

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 2a22198df32b57e04ea4df6225ee0c9d4e5c3e2c..c8b4e0cd8fac96172e435fc334ab7530b6bdad0d 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -31,11 +31,15 @@ property :command, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :service, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :service, :kind_of => String

+property :scrape_interval, :kind_of => String
+property :scrape_timeout, :kind_of => String

 property :metric_relabel, :kind_of => Array
 property :register_target, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   systemd_service service_name do
 property :metric_relabel, :kind_of => Array
 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
     description "Prometheus #{new_resource.exporter} exporter"
     type "simple"
     user new_resource.user


@@ -67,6 +71,8 @@ action :create do
     node.default[:prometheus][:exporters][new_resource.port] = {
       :name => new_resource.exporter,
       :address => listen_address,
     node.default[:prometheus][:exporters][new_resource.port] = {
       :name => new_resource.exporter,
       :address => listen_address,

+      :scrape_interval => new_resource.scrape_interval,
+      :scrape_timeout => new_resource.scrape_timeout,

       :metric_relabel => new_resource.metric_relabel
     }
   end
       :metric_relabel => new_resource.metric_relabel
     }
   end


@@ -99,11 +105,27 @@ action_class do
   end
 
   def service_exists?
   end
 
   def service_exists?

-    File.exist?("/etc/systemd/system/#{service_name}.service")
+    ::File.exist?("/etc/systemd/system/#{service_name}.service")

   end
 
   def executable_path
   end
 
   def executable_path

-    "/opt/prometheus-exporters/exporters/#{new_resource.exporter}/#{new_resource.exporter}_exporter"
+    if ::File.exist?("#{executable_directory}/#{executable_name}_#{executable_architecture}")
+      "#{executable_directory}/#{executable_name}_#{executable_architecture}"
+    else
+      "#{executable_directory}/#{executable_name}"
+    end
+  end
+
+  def executable_directory
+    "/opt/prometheus-exporters/exporters/#{new_resource.exporter}"
+  end
+
+  def executable_name
+    "#{new_resource.exporter}_exporter"
+  end
+
+  def executable_architecture
+    node[:kernel][:machine]

   end
 
   def executable_options
   end
 
   def executable_options