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

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

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 581c961ddd4709de25cad39b564eeacb18de921f..5075c5d6ae3a6ed17e928008a030659e3f15990a 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -33,18 +33,41 @@ property :options, :kind_of => [String, Array]
 property :environment, :kind_of => Hash, :default => {}
 property :protect_proc, String
 property :proc_subset, String
 property :environment, :kind_of => Hash, :default => {}
 property :protect_proc, String
 property :proc_subset, String

+property :capability_bounding_set, [String, Array]
+property :ambient_capabilities, [String, Array]

 property :private_devices, [true, false]
 property :private_devices, [true, false]

+property :private_users, [true, false]

 property :protect_clock, [true, false]
 property :restrict_address_families, [String, Array]
 property :remove_ipc, [true, false]
 property :system_call_filter, [String, Array]
 property :service, :kind_of => String
 property :protect_clock, [true, false]
 property :restrict_address_families, [String, Array]
 property :remove_ipc, [true, false]
 property :system_call_filter, [String, Array]
 property :service, :kind_of => String

+property :labels, :kind_of => Hash, :default => {}

 property :scrape_interval, :kind_of => String
 property :scrape_timeout, :kind_of => String
 property :metric_relabel, :kind_of => Array
 property :register_target, :kind_of => [TrueClass, FalseClass], :default => true
 property :scrape_interval, :kind_of => String
 property :scrape_timeout, :kind_of => String
 property :metric_relabel, :kind_of => Array
 property :register_target, :kind_of => [TrueClass, FalseClass], :default => true

+property :ssh, [true, false]

 
 action :create do
 
 action :create do

+  if new_resource.ssh && new_resource.user.nil?
+    keys = data_bag_item("prometheus", "keys")
+
+    directory "/var/lib/private/prometheus/#{new_resource.exporter}-exporter" do
+      mode "700"
+      recursive true
+    end
+
+    file "/var/lib/private/prometheus/#{new_resource.exporter}-exporter/id_rsa" do
+      content keys["ssh"].join("\n")
+      mode "400"
+    end
+
+    cookbook_file "/var/lib/private/prometheus/#{new_resource.exporter}-exporter/id_rsa.pub" do
+      mode "644"
+    end
+  end
+

   systemd_service service_name do
     after "network-online.target"
     wants "network-online.target"
   systemd_service service_name do
     after "network-online.target"
     wants "network-online.target"


@@ -56,9 +79,13 @@ action :create do
     environment new_resource.environment
     exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     sandbox :enable_network => true
     environment new_resource.environment
     exec_start "#{executable_path} #{new_resource.command} #{executable_options}"
     sandbox :enable_network => true

+    state_directory "prometheus/#{new_resource.exporter}-exporter" if new_resource.ssh && new_resource.user.nil?

     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)
     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)

+    capability_bounding_set new_resource.capability_bounding_set if new_resource.property_is_set?(:capability_bounding_set)
+    ambient_capabilities new_resource.ambient_capabilities if new_resource.property_is_set?(:ambient_capabilities)

     private_devices new_resource.private_devices if new_resource.property_is_set?(:private_devices)
     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)
     restrict_address_families new_resource.restrict_address_families if new_resource.property_is_set?(:restrict_address_families)
     remove_ipc new_resource.remove_ipc if new_resource.property_is_set?(:remove_ipc)
     protect_clock new_resource.protect_clock if new_resource.property_is_set?(:protect_clock)
     restrict_address_families new_resource.restrict_address_families if new_resource.property_is_set?(:restrict_address_families)
     remove_ipc new_resource.remove_ipc if new_resource.property_is_set?(:remove_ipc)


@@ -72,9 +99,9 @@ action :create do
 
   firewall_rule "accept-prometheus-#{new_resource.exporter}" do
     action :accept
 
   firewall_rule "accept-prometheus-#{new_resource.exporter}" do
     action :accept

-    source "osm"
-    dest "fw"
-    proto "tcp:syn"
+    context :incoming
+    protocol :tcp
+    source :osm

     dest_ports new_resource.port
     only_if { node[:prometheus][:mode] == "external" }
   end
     dest_ports new_resource.port
     only_if { node[:prometheus][:mode] == "external" }
   end


@@ -85,6 +112,7 @@ action :create do
     node.default[:prometheus][:exporters][new_resource.port] = {
       :name => new_resource.exporter,
       :address => listen_address,
     node.default[:prometheus][:exporters][new_resource.port] = {
       :name => new_resource.exporter,
       :address => listen_address,

+      :labels => new_resource.labels,

       :scrape_interval => new_resource.scrape_interval,
       :scrape_timeout => new_resource.scrape_timeout,
       :metric_relabel => new_resource.metric_relabel
       :scrape_interval => new_resource.scrape_interval,
       :scrape_timeout => new_resource.scrape_timeout,
       :metric_relabel => new_resource.metric_relabel