discourse: remove discourse-canned-replies, switch back to upstream for discourse...

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

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 1c4f8e2d20f8a9500e91a8bc0ae04609f88d5355..a480a83239b5ad4f924524431892e3345d16660b 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -19,9 +19,7 @@
 
 include_recipe "apache"
 include_recipe "apt::grafana"
 
 include_recipe "apache"
 include_recipe "apt::grafana"

-include_recipe "apt::timescaledb"

 include_recipe "networking"
 include_recipe "networking"

-include_recipe "timescaledb"

 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")
 
 passwords = data_bag_item("prometheus", "passwords")
 tokens = data_bag_item("prometheus", "tokens")


@@ -48,9 +46,9 @@ end
 
 cache_dir = Chef::Config[:file_cache_path]
 
 
 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"
 
 directory "/opt/prometheus-server" do
   owner "root"


@@ -111,78 +109,6 @@ archive_file "#{cache_dir}/karma-linux-amd64.tar.gz" do
   subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]", :immediately
 end
 
   subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]", :immediately
 end
 

-promscale_version = "0.17.0"
-promscale_extension_version = "0.8.0-1"
-
-database_version = node[:timescaledb][:database_version]
-database_cluster = "#{database_version}/main"
-
-package %W[
-  prometheus
-  promscale-extension-postgresql-#{database_version}
-]
-
-package "promscale-extension-postgresql-#{database_version}" do
-  version promscale_extension_version
-end
-
-apt_preference "promscale-extension-postgresql" do
-  pin "version #{promscale_extension_version}"
-  pin_priority "1100"
-end
-
-postgresql_user "prometheus" do
-  cluster database_cluster
-  superuser true
-end
-
-postgresql_database "promscale" do
-  cluster database_cluster
-  owner "prometheus"
-end
-
-directory "/opt/promscale" do
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-directory "/opt/promscale/bin" do
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-remote_file "/opt/promscale/bin/promscale" do
-  action :create
-  source "https://github.com/timescale/promscale/releases/download/#{promscale_version}/promscale_#{promscale_version}_Linux_x86_64"
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-systemd_service "promscale" do
-  description "Promscale Connector"
-  type "simple"
-  user "prometheus"
-  exec_start "/opt/promscale/bin/promscale --db.uri postgresql:///promscale?host=/run/postgresql&port=5432 --db.connections-max 400"
-  limit_nofile 16384
-  sandbox :enable_network => true
-  restrict_address_families "AF_UNIX"
-end
-
-if node[:prometheus][:promscale]
-  service "promscale" do
-    action [:enable, :start]
-    subscribes :restart, "remote_file[/opt/promscale/bin/promscale]"
-    subscribes :restart, "systemd_service[promscale]"
-  end
-else
-  service "promscale" do
-    action [:disable, :stop]
-  end
-end
-

 search(:node, "roles:gateway") do |gateway|
   allowed_ips = gateway.ipaddresses(:role => :internal).map(&:subnet)
 
 search(:node, "roles:gateway") do |gateway|
   allowed_ips = gateway.ipaddresses(:role => :internal).map(&:subnet)
 


@@ -194,6 +120,7 @@ search(:node, "roles:gateway") do |gateway|
 end
 
 jobs = {}
 end
 
 jobs = {}

+junos_targets = []

 snmp_targets = []
 
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
 snmp_targets = []
 
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|


@@ -210,6 +137,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       name = exporter[:name]
       address = exporter[:address]
       sni = exporter[:sni]
       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] || []
       scrape_interval = exporter[:scrape_interval]
       scrape_timeout = exporter[:scrape_timeout]
       metric_relabel = exporter[:metric_relabel] || []


@@ -217,6 +145,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       name = key
       address = exporter
       sni = nil
       name = key
       address = exporter
       sni = nil

+      labels = []

       scrape_interval = nil
       scrape_timeout = nil
       metric_relabel = []
       scrape_interval = nil
       scrape_timeout = nil
       metric_relabel = []


@@ -227,12 +156,22 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :address => address,
       :sni => sni,
       :instance => client.name.split(".").first,
       :address => address,
       :sni => sni,
       :instance => client.name.split(".").first,

+      :labels => labels,

       :scrape_interval => scrape_interval,
       :scrape_timeout => scrape_timeout,
       :metric_relabel => metric_relabel
     }
   end
 
       :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,
   Hash(client[:prometheus][:snmp]).each do |instance, details|
     snmp_targets << {
       :instance => instance,


@@ -270,6 +209,8 @@ prometheus_exporter "ssl" do
   register_target false
 end
 
   register_target false
 end
 

+package "prometheus"
+

 systemd_service "prometheus-executable" do
   service "prometheus"
   dropin "executable"
 systemd_service "prometheus-executable" do
   service "prometheus"
   dropin "executable"


@@ -283,7 +224,7 @@ template "/etc/prometheus/prometheus.yml" do
   owner "root"
   group "root"
   mode "644"
   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
 end
 
 template "/etc/prometheus/alert_rules.yml" do