X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dab49e324ed9791aa28e09d97b4023a8a398cb06..6769f06b626d566508eaa96a9892d05aeb331f24:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d21227ee8..7da715cde 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -37,13 +37,13 @@ package %w[
   prometheus-alertmanager
 ]
 
-promscale_version = "0.2.0"
+promscale_version = "0.5.1"
 
 database_cluster = "#{node[:timescaledb][:database_version]}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster
-  createrole true
+  superuser true
 end
 
 postgresql_database "promscale" do
@@ -51,11 +51,6 @@ postgresql_database "promscale" do
   owner "prometheus"
 end
 
-postgresql_extension "timescaledb" do
-  cluster database_cluster
-  database "promscale"
-end
-
 directory "/opt/promscale" do
   owner "root"
   group "root"
@@ -73,7 +68,7 @@ package %w[
 git "/opt/promscale/extension" do
   action :sync
   repository "https://github.com/timescale/promscale_extension.git"
-  revision "0.1.1"
+  revision "0.2.0"
   user "root"
   group "root"
 end
@@ -106,7 +101,7 @@ systemd_service "promscale" do
   description "Promscale Connector"
   type "simple"
   user "prometheus"
-  exec_start "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port 5432 --db-user prometheus --db-name promscale --db-connections-max 400"
+  exec_start "/opt/promscale/bin/promscale --db-uri postgresql:///promscale?host=/run/postgresql&port=5432 --db-connections-max 400"
   # exec_start lazy { "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port #{node[:postgresql][:clusters][database_cluster][:port]} --db-user prometheus --db-name promscale --db-max-connections 400" }
   limit_nofile 16384
   private_tmp true
@@ -121,14 +116,8 @@ service "promscale" do
   subscribes :restart, "systemd_service[promscale]"
 end
 
-postgresql_extension "promscale" do
-  cluster database_cluster
-  database "promscale"
-  notifies :restart, "service[promscale]"
-end
-
 systemd_service "promscale-maintenance" do
-  description "Promscale Maintenace"
+  description "Promscale Maintenance"
   type "simple"
   user "prometheus"
   exec_start "/usr/bin/psql --command='CALL prom_api.execute_maintenance()' promscale"
@@ -161,6 +150,7 @@ search(:node, "roles:gateway") do |gateway|
 end
 
 jobs = {}
+snmp_targets = []
 
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
   if client[:prometheus][:mode] == "wireguard"
@@ -189,6 +179,16 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :metric_relabel => metric_relabel
     }
   end
+
+  Hash(client[:prometheus][:snmp]).each do |instance, details|
+    snmp_targets << {
+      :instance => instance,
+      :target => details[:address],
+      :module => details[:module],
+      :address => client[:prometheus][:addresses]["snmp"],
+      :labels => Array(details[:labels])
+    }
+  end
 end
 
 certificates = search(:node, "letsencrypt:certificates").each_with_object({}) do |n, c|
@@ -229,7 +229,7 @@ template "/etc/prometheus/prometheus.yml" do
   owner "root"
   group "root"
   mode "644"
-  variables :jobs => jobs, :certificates => certificates
+  variables :jobs => jobs, :snmp_targets => snmp_targets, :certificates => certificates
 end
 
 template "/etc/prometheus/alert_rules.yml" do