Label SNMP statistics with the site name

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index c8241a1f1d3ed0f5a8adcceee5cd360eef37b05c..382fc7f21befbe001649577edd4e405e2fac4cdd 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -185,7 +185,8 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :instance => instance,
       :target => details[:address],
       :module => details[:module],
-      :address => client[:prometheus][:addresses]["snmp"]
+      :address => client[:prometheus][:addresses]["snmp"],
+      :labels => Array(details[:labels])
     }
   end
 end

diff --git a/cookbooks/prometheus/templates/default/prometheus.yml.erb b/cookbooks/prometheus/templates/default/prometheus.yml.erb
index 812f3229913fb16fae1686a9f9469d9ec00610b9..d972d2948172d5f40e965ea9a8c67a3d164828bf 100644 (file)
--- a/cookbooks/prometheus/templates/default/prometheus.yml.erb
+++ b/cookbooks/prometheus/templates/default/prometheus.yml.erb
@@ -84,6 +84,9 @@ scrape_configs:
           - "<%= target[:target] %>/<%= target[:module] %>/<%= target[:address] %>"
         labels:
           instance: <%= target[:instance] %>
+<% target[:labels].sort.each do |name, value| -%>
+          <%= name %>: <%= value %>
+<% end -%>
 <% end -%>
     relabel_configs:
       - source_labels: [__address__]

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 46bcde332c4055cedd79f4c71139632ab5e6a0d0..ad5ea034b8fdda92c1d35a9dce339d4c1f54c1a2 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -60,9 +60,9 @@ default_attributes(
   },
   :prometheus => {
     :snmp => {
-      "pdu1" => { :address => "10.0.48.100", :module => "apcups" },
-      "pdu2" => { :address => "10.0.48.101", :module => "apcups" },
-      "switch1" => { :address => "130.117.76.2", :module => "if_mib" }
+      "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } },
+      "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } },
+      "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } }
     }
   },
   :rsyncd => {