X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/39e9c0f23c2c459285df473de8011221f429dbad..5f6c31a1fa2ffa34a8d2ce071d8e539f74282817:/cookbooks/prometheus/resources/exporter.rb?ds=sidebyside

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 2d6a7cbc8..3087f9c93 100644
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -27,9 +27,11 @@ 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
+property :group, :kind_of => String
 property :command, :kind_of => String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
+property :protect_proc, String
 property :proc_subset, String
 property :private_devices, [true, false]
 property :protect_clock, [true, false]
@@ -49,9 +51,11 @@ action :create do
     type "simple"
     user new_resource.user
     dynamic_user new_resource.user.nil?
+    group new_resource.group
     environment new_resource.environment
     exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     sandbox :enable_network => true
+    protect_proc new_resource.protect_proc if new_resource.property_is_set?(:protect_proc)
     proc_subset new_resource.proc_subset if new_resource.property_is_set?(:proc_subset)
     private_devices new_resource.private_devices if new_resource.property_is_set?(:private_devices)
     protect_clock new_resource.protect_clock if new_resource.property_is_set?(:protect_clock)
@@ -148,9 +152,7 @@ action_class do
   end
 
   def listen_address
-    if true
-      "127.0.0.1:#{new_resource.port}"
-    elsif new_resource.address
+    if new_resource.address
       "#{new_resource.address}:#{new_resource.port}"
     elsif node[:prometheus][:mode] == "wireguard"
       "[#{node[:prometheus][:address]}]:#{new_resource.port}"