X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/989be49b3854b167a6ccb8531d1b24ff73e9c3c8..9d1da497d442b16de5ab68a9cf74f832059734e7:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 28f757672..a480a8323 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -46,9 +46,9 @@ end
 
 cache_dir = Chef::Config[:file_cache_path]
 
-prometheus_version = "2.41.0"
-alertmanager_version = "0.24.0"
-karma_version = "0.111"
+prometheus_version = "2.45.0"
+alertmanager_version = "0.25.0"
+karma_version = "0.114"
 
 directory "/opt/prometheus-server" do
   owner "root"
@@ -120,6 +120,7 @@ search(:node, "roles:gateway") do |gateway|
 end
 
 jobs = {}
+junos_targets = []
 snmp_targets = []
 
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
@@ -136,6 +137,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       name = exporter[:name]
       address = exporter[:address]
       sni = exporter[:sni]
+      labels = Array(exporter[:labels])
       scrape_interval = exporter[:scrape_interval]
       scrape_timeout = exporter[:scrape_timeout]
       metric_relabel = exporter[:metric_relabel] || []
@@ -143,6 +145,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       name = key
       address = exporter
       sni = nil
+      labels = []
       scrape_interval = nil
       scrape_timeout = nil
       metric_relabel = []
@@ -153,12 +156,22 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :address => address,
       :sni => sni,
       :instance => client.name.split(".").first,
+      :labels => labels,
       :scrape_interval => scrape_interval,
       :scrape_timeout => scrape_timeout,
       :metric_relabel => metric_relabel
     }
   end
 
+  Hash(client[:prometheus][:junos]).each do |instance, details|
+    junos_targets << {
+      :instance => instance,
+      :target => details[:address],
+      :address => client[:prometheus][:addresses]["junos"],
+      :labels => Array(details[:labels])
+    }
+  end
+
   Hash(client[:prometheus][:snmp]).each do |instance, details|
     snmp_targets << {
       :instance => instance,
@@ -196,6 +209,8 @@ prometheus_exporter "ssl" do
   register_target false
 end
 
+package "prometheus"
+
 systemd_service "prometheus-executable" do
   service "prometheus"
   dropin "executable"
@@ -209,7 +224,7 @@ template "/etc/prometheus/prometheus.yml" do
   owner "root"
   group "root"
   mode "644"
-  variables :jobs => jobs, :snmp_targets => snmp_targets, :certificates => certificates
+  variables :jobs => jobs, :junos_targets => junos_targets, :snmp_targets => snmp_targets, :certificates => certificates
 end
 
 template "/etc/prometheus/alert_rules.yml" do