nominatim: also download us postcode data

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

diff --git a/cookbooks/prometheus/recipes/default.rb b/cookbooks/prometheus/recipes/default.rb
index 71325238a4550843c3f397f59c7a650b036f2f1b..2ad1d69aa7934eb0098f177721f0ce2032a1e966 100644 (file)
--- a/cookbooks/prometheus/recipes/default.rb
+++ b/cookbooks/prometheus/recipes/default.rb
@@ -20,6 +20,8 @@
 include_recipe "git"
 include_recipe "networking"
 
+package "ruby"
+
 if node.internal_ipaddress
   node.default[:prometheus][:mode] = "internal"
   node.default[:prometheus][:address] = node.internal_ipaddress
@@ -64,13 +66,20 @@ directory "/etc/prometheus/collectors" do
   recursive true
 end
 
-directory "/var/lib/prometheus/node-exporter" do
+directory "/etc/prometheus/exporters" do
   owner "root"
   group "root"
   mode "755"
   recursive true
 end
 
+directory "/var/lib/prometheus/node-exporter" do
+  owner "root"
+  group "adm"
+  mode "775"
+  recursive true
+end
+
 template "/var/lib/prometheus/node-exporter/chef.prom" do
   source "chef.prom.erb"
   owner "root"
@@ -78,7 +87,29 @@ template "/var/lib/prometheus/node-exporter/chef.prom" do
   mode "644"
 end
 
+metric_relabel = []
+
+node[:hardware][:hwmon].each do |chip, details|
+  next unless details[:ignore]
+
+  sensors = details[:ignore].join("|")
+
+  metric_relabel << {
+    :source_labels => "chip,sensor",
+    :regex => "#{chip};(#{sensors})",
+    :action => "drop"
+  }
+end
+
 prometheus_exporter "node" do
   port 9100
-  options "--collector.ntp --collector.processes --collector.interrupts --collector.textfile.directory=/var/lib/prometheus/node-exporter"
+  options %w[
+    --collector.textfile.directory=/var/lib/prometheus/node-exporter
+    --collector.interrupts
+    --collector.ntp
+    --collector.processes
+    --collector.systemd
+    --collector.tcpstat
+  ]
+  metric_relabel metric_relabel
 end