X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4b80ec4ce3e502101f6dc4f1a8aba4fb6e69b6b..dc88c4068c574ea04d3085c8d8b0b80660688db7:/cookbooks/prometheus/resources/exporter.rb

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 22e364f9f..69cb80e14 100644
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -22,9 +22,12 @@ default_action :create
 property :exporter, :kind_of => String, :name_property => true
 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
+property :listen_type, :kind_of => String, :default => "address"
 property :user, :kind_of => String, :default => "root"
+property :command, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
+property :service, :kind_of => String
 
 action :create do
   systemd_service service_name do
@@ -32,7 +35,7 @@ action :create do
     type "simple"
     user new_resource.user
     environment new_resource.environment
-    exec_start "#{executable_path} #{executable_options}"
+    exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     private_tmp true
     protect_system "strict"
     protect_home true
@@ -53,7 +56,9 @@ action :create do
     only_if { node[:prometheus][:mode] == "external" }
   end
 
-  node.default[:prometheus][:exporters][new_resource.exporter] = listen_address
+  node.default[:prometheus][:exporters][new_resource.port] = {
+    :name => new_resource.exporter, :address => listen_address
+  }
 end
 
 action :delete do
@@ -74,7 +79,11 @@ end
 
 action_class do
   def service_name
-    "prometheus-#{new_resource.exporter}-exporter"
+    if new_resource.service
+      "prometheus-#{new_resource.service}-exporter"
+    else
+      "prometheus-#{new_resource.exporter}-exporter"
+    end
   end
 
   def executable_path
@@ -82,7 +91,14 @@ action_class do
   end
 
   def executable_options
-    "--#{new_resource.listen_switch}=#{listen_address} #{Array(new_resource.options).join(' ')}"
+    "--#{new_resource.listen_switch}=#{listen_argument} #{Array(new_resource.options).join(' ')}"
+  end
+
+  def listen_argument
+    case new_resource.listen_type
+    when "address" then listen_address
+    when "url" then "http://#{listen_address}/metrics"
+    end
   end
 
   def listen_address