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

[chef.git] / cookbooks / prometheus / recipes / smokeping.rb

diff --git a/cookbooks/prometheus/recipes/smokeping.rb b/cookbooks/prometheus/recipes/smokeping.rb
index 975f8a5c25be1bcb6c2d64029f7de0ac3f5002ef..27b0c6dd66f5b1cc191af7ad4996926ff47d1bc1 100644 (file)
--- a/cookbooks/prometheus/recipes/smokeping.rb
+++ b/cookbooks/prometheus/recipes/smokeping.rb
@@ -25,8 +25,8 @@ ip6_hosts = []
 search(:node, "networking:interfaces") do |host|
   next if host.name == node.name
 
 search(:node, "networking:interfaces") do |host|
   next if host.name == node.name
 

-  ip4_hosts << host[:fqdn] unless host.interfaces(:role => :external, :family => :inet).empty?
-  ip6_hosts << host[:fqdn] unless host.interfaces(:role => :external, :family => :inet6).empty?
+  ip4_hosts << host[:fqdn] unless host.ipaddresses(:role => :external, :family => :inet).empty?
+  ip6_hosts << host[:fqdn] unless host.ipaddresses(:role => :external, :family => :inet6).empty?

 end
 
 template "/etc/prometheus/exporters/smokeping.yml" do
 end
 
 template "/etc/prometheus/exporters/smokeping.yml" do


@@ -40,4 +40,8 @@ end
 prometheus_exporter "smokeping" do
   port 9374
   options "--config.file=/etc/prometheus/exporters/smokeping.yml"
 prometheus_exporter "smokeping" do
   port 9374
   options "--config.file=/etc/prometheus/exporters/smokeping.yml"

+  capability_bounding_set "CAP_NET_RAW"
+  ambient_capabilities "CAP_NET_RAW"
+  private_users false
+  subscribes :restart, "template[/etc/prometheus/exporters/smokeping.yml]"

 end
 end