Merge remote-tracking branch 'github/pull/447'

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

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 8dd9288464751f94ddc54e24cb7f970bcc4d0ae3..df5304b3c3aeeebf5a92332237dda68605a97a38 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -17,37 +17,42 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true
 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true

+property :address, :kind_of => String

 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"

-property :exporter_options, :kind_of => [String, Array]
-property :package, :kind_of => String
-property :package_options, :kind_of => String
-property :defaults, :kind_of => String
+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
 property :service, :kind_of => String

+property :metric_relabel, :kind_of => Array
+property :register_target, :kind_of => [TrueClass, FalseClass], :default => true

 
 action :create do
 
 action :create do

-  package package_name do
-    options new_resource.package_options
-  end
-
-  template defaults_name do
-    cookbook "prometheus"
-    source "defaults.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    variables new_resource.to_hash.merge(:listen_address => listen_address)
+  systemd_service service_name do
+    description "Prometheus #{new_resource.exporter} exporter"
+    type "simple"
+    user new_resource.user
+    environment new_resource.environment
+    exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
+    private_tmp true
+    protect_system "strict"
+    protect_home true
+    no_new_privileges true

   end
 
   service service_name do
     action [:enable, :start]
   end
 
   service service_name do
     action [:enable, :start]

-    subscribes :restart, "template[#{defaults_name}]"
+    subscribes :restart, "systemd_service[#{service_name}]"

   end
 
   end
 

-  firewall_rule "accept-prometheus-#{new_resource.name}" do
+  firewall_rule "accept-prometheus-#{new_resource.exporter}" do

     action :accept
     source "osm"
     dest "fw"
     action :accept
     source "osm"
     dest "fw"


@@ -56,7 +61,15 @@ action :create do
     only_if { node[:prometheus][:mode] == "external" }
   end
 
     only_if { node[:prometheus][:mode] == "external" }
   end
 

-  node.default[:prometheus][:exporters][new_resource.exporter] = listen_address
+  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,
+      :address => listen_address,
+      :metric_relabel => new_resource.metric_relabel
+    }
+  end

 end
 
 action :delete do
 end
 
 action :delete do


@@ -64,29 +77,52 @@ action :delete do
     action [:disable, :stop]
   end
 
     action [:disable, :stop]
   end
 

-  package package_name do
-    action :purge
+  systemd_service service_name do
+    action :delete
+  end
+end
+
+action :restart do
+  service service_name do
+    action :restart

   end
 end
 
 action_class do
   end
 end
 
 action_class do

-  def package_name
-    new_resource.package || "prometheus-#{new_resource.exporter}-exporter"
+  def service_name
+    if new_resource.service
+      "prometheus-#{new_resource.service}-exporter"
+    else
+      "prometheus-#{new_resource.exporter}-exporter"
+    end
+  end
+
+  def executable_path
+    "/opt/prometheus/exporters/#{new_resource.exporter}/#{new_resource.exporter}_exporter"
+  end
+
+  def executable_options
+    "--#{new_resource.listen_switch}=#{listen_argument} #{Array(new_resource.options).join(' ')}"

   end
 
   end
 

-  def defaults_name
-    new_resource.defaults || "/etc/default/prometheus-#{new_resource.exporter}-exporter"
+  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
   end
 
   def listen_address

-    if node[:prometheus][:mode] == "wireguard"
+    if new_resource.address
+      "#{new_resource.address}:#{new_resource.port}"
+    elsif node[:prometheus][:mode] == "wireguard"

       "[#{node[:prometheus][:address]}]:#{new_resource.port}"
     else
       "#{node[:prometheus][:address]}:#{new_resource.port}"
     end
   end
       "[#{node[:prometheus][:address]}]:#{new_resource.port}"
     else
       "#{node[:prometheus][:address]}:#{new_resource.port}"
     end
   end

+end

 
 

-  def service_name
-    new_resource.service || "prometheus-#{new_resource.exporter}-exporter"
-  end
+def after_created
+  subscribes :restart, "git[/opt/prometheus]"

 end
 end