Use URI for promscale database connection

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

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index b4a4c36da45428f2f237a8b10de2f2ff1750eee6..1a3fb7db0e6f9f8e5e0c55683bdd02994729acb0 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -37,13 +37,13 @@ package %w[
   prometheus-alertmanager
 ]
 
   prometheus-alertmanager
 ]
 

-promscale_version = "0.1.4"
+promscale_version = "0.5.0"

 
 database_cluster = "#{node[:timescaledb][:database_version]}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster
 
 database_cluster = "#{node[:timescaledb][:database_version]}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster

-  createrole true
+  superuser true

 end
 
 postgresql_database "promscale" do
 end
 
 postgresql_database "promscale" do


@@ -51,11 +51,6 @@ postgresql_database "promscale" do
   owner "prometheus"
 end
 
   owner "prometheus"
 end
 

-postgresql_extension "timescaledb" do
-  cluster database_cluster
-  database "promscale"
-end
-

 directory "/opt/promscale" do
   owner "root"
   group "root"
 directory "/opt/promscale" do
   owner "root"
   group "root"


@@ -106,7 +101,7 @@ systemd_service "promscale" do
   description "Promscale Connector"
   type "simple"
   user "prometheus"
   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
   # 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,12 +116,6 @@ service "promscale" do
   subscribes :restart, "systemd_service[promscale]"
 end
 
   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"
   type "simple"
 systemd_service "promscale-maintenance" do
   description "Promscale Maintenace"
   type "simple"


@@ -148,8 +137,6 @@ service "promscale-maintenance.timer" do
   action [:enable, :start]
 end
 
   action [:enable, :start]
 end
 

-jobs = {}
-

 search(:node, "roles:gateway") do |gateway|
   allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
     "#{interface[:network]}/#{interface[:prefix]}"
 search(:node, "roles:gateway") do |gateway|
   allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
     "#{interface[:network]}/#{interface[:prefix]}"


@@ -162,6 +149,9 @@ search(:node, "roles:gateway") do |gateway|
   }
 end
 
   }
 end
 

+jobs = {}
+snmp_targets = []
+

 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
   if client[:prometheus][:mode] == "wireguard"
     node.default[:networking][:wireguard][:peers] << {
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
   if client[:prometheus][:mode] == "wireguard"
     node.default[:networking][:wireguard][:peers] << {


@@ -189,6 +179,42 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :metric_relabel => metric_relabel
     }
   end
       :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|
+  n[:letsencrypt][:certificates].each do |name, details|
+    c[name] ||= details.merge(:nodes => [])
+
+    c[name][:nodes] << {
+      :name => n[:fqdn],
+      :address => n.external_ipaddress || n.internal_ipaddress
+    }
+  end
+end
+
+template "/etc/prometheus/ssl.yml" do
+  source "ssl.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  variables :certificates => certificates
+end
+
+prometheus_exporter "ssl" do
+  address "127.0.0.1"
+  port 9219
+  options "--config.file=/etc/prometheus/ssl.yml"
+  register_target false

 end
 
 template "/etc/default/prometheus" do
 end
 
 template "/etc/default/prometheus" do


@@ -203,7 +229,7 @@ template "/etc/prometheus/prometheus.yml" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  variables :jobs => jobs
+  variables :jobs => jobs, :snmp_targets => snmp_targets, :certificates => certificates

 end
 
 template "/etc/prometheus/alert_rules.yml" do
 end
 
 template "/etc/prometheus/alert_rules.yml" do