From 32b6366e4fa837ab0dda57abe17510131485e5a2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 7 Mar 2021 14:28:54 +0000 Subject: [PATCH] Label SNMP statistics with the site name --- cookbooks/prometheus/recipes/server.rb | 3 ++- cookbooks/prometheus/templates/default/prometheus.yml.erb | 3 +++ roles/ironbelly.rb | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb index c8241a1f1..382fc7f21 100644 --- 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 812f32299..d972d2948 100644 --- 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 46bcde332..ad5ea034b 100644 --- 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 => { -- 2.45.1