Try and ensure tile server use an integer number of listen buckets

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

diff --git a/cookbooks/prometheus/resources/collector.rb b/cookbooks/prometheus/resources/collector.rb
index 0ae8320f7ece8563979a4e1ee81a182b8db375fb..ce68a7e5c5dcdd2a0a3038dd0f77ce9428949d07 100644 (file)
--- a/cookbooks/prometheus/resources/collector.rb
+++ b/cookbooks/prometheus/resources/collector.rb
@@ -24,6 +24,7 @@ default_action :create
 property :collector, :kind_of => String, :name_property => true
 property :interval, :kind_of => [Integer, String], :required => [:create]
 property :user, :kind_of => String
 property :collector, :kind_of => String, :name_property => true
 property :interval, :kind_of => [Integer, String], :required => [:create]
 property :user, :kind_of => String

+property :path, :kind_of => String

 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :proc_subset, String
 property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :proc_subset, String


@@ -31,10 +32,12 @@ property :capability_bounding_set, [String, Array]
 property :private_devices, [true, false]
 property :private_users, [true, false]
 property :protect_clock, [true, false]
 property :private_devices, [true, false]
 property :private_users, [true, false]
 property :protect_clock, [true, false]

+property :protect_kernel_modules, [true, false]

 
 action :create do
   systemd_service service_name do
     description "Prometheus #{new_resource.collector} collector"
 
 action :create do
   systemd_service service_name do
     description "Prometheus #{new_resource.collector} collector"

+    type "oneshot"

     user new_resource.user
     dynamic_user new_resource.user.nil?
     group "adm"
     user new_resource.user
     dynamic_user new_resource.user.nil?
     group "adm"


@@ -49,6 +52,7 @@ action :create do
     private_devices new_resource.private_devices if new_resource.property_is_set?(:private_devices)
     private_users new_resource.private_users if new_resource.property_is_set?(:private_users)
     protect_clock new_resource.protect_clock if new_resource.property_is_set?(:protect_clock)
     private_devices new_resource.private_devices if new_resource.property_is_set?(:private_devices)
     private_users new_resource.private_users if new_resource.property_is_set?(:private_users)
     protect_clock new_resource.protect_clock if new_resource.property_is_set?(:protect_clock)

+    protect_kernel_modules new_resource.protect_kernel_modules if new_resource.property_is_set?(:protect_kernel_modules)

     read_write_paths ["/var/lib/prometheus/node-exporter", "/var/lock", "/var/log"]
   end
 
     read_write_paths ["/var/lib/prometheus/node-exporter", "/var/lock", "/var/log"]
   end
 


@@ -88,7 +92,7 @@ action_class do
   end
 
   def executable_path
   end
 
   def executable_path

-    "/opt/prometheus-exporters/collectors/#{new_resource.collector}/#{new_resource.collector}_collector"
+    new_resource.path || "/opt/prometheus-exporters/collectors/#{new_resource.collector}/#{new_resource.collector}_collector"

   end
 
   def executable_options
   end
 
   def executable_options