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 69cb80e142497d82f926615a9f154653cd2b2b6a..df5304b3c3aeeebf5a92332237dda68605a97a38 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -17,9 +17,12 @@
 # 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 :listen_type, :kind_of => String, :default => "address"
 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"


@@ -28,6 +31,8 @@ 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 :metric_relabel, :kind_of => Array
+property :register_target, :kind_of => [TrueClass, FalseClass], :default => true

 
 action :create do
   systemd_service service_name do
 
 action :create do
   systemd_service service_name do


@@ -56,9 +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.port] = {
-    :name => new_resource.exporter, :address => 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


@@ -102,7 +113,9 @@ action_class do
   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}"
       "[#{node[:prometheus][:address]}]:#{new_resource.port}"
     else
       "#{node[:prometheus][:address]}:#{new_resource.port}"