Don't apply HP disk rules to disks not on HP controllers

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

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d848d80ca7c6014e0b9cf908d8e057b2328f61b8..f34af60da65fdb128aa2de487ce2030dcc97abb9 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -18,7 +18,8 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

-include_recipe "apt"
+include_recipe "apt::grafana"
+include_recipe "apt::timescaledb"

 include_recipe "networking"
 include_recipe "timescaledb"
 
 include_recipe "networking"
 include_recipe "timescaledb"
 


@@ -28,16 +29,28 @@ admins = data_bag_item("apache", "admins")
 
 prometheus_exporter "fastly" do
   port 8080
 
 prometheus_exporter "fastly" do
   port 8080

-  listen_switch "endpoint"
-  listen_type "url"
+  listen_switch "listen"

   environment "FASTLY_API_TOKEN" => tokens["fastly"]
 end
 
   environment "FASTLY_API_TOKEN" => tokens["fastly"]
 end
 

+prometheus_exporter "fastly_healthcheck" do
+  port 9696
+  scrape_interval "1m"
+  environment "FASTLY_API_TOKEN" => tokens["fastly"]
+end
+
+prometheus_exporter "statuscake" do
+  port 9595
+  scrape_interval "5m"
+  scrape_timeout "2m"
+  environment "STATUSCAKE_APIKEY" => tokens["statuscake"]
+end
+

 cache_dir = Chef::Config[:file_cache_path]
 
 cache_dir = Chef::Config[:file_cache_path]
 

-prometheus_version = "2.31.1"
-alertmanager_version = "0.23.0"
-karma_version = "0.93"
+prometheus_version = "2.41.0"
+alertmanager_version = "0.24.0"
+karma_version = "0.111"

 
 directory "/opt/prometheus-server" do
   owner "root"
 
 directory "/opt/prometheus-server" do
   owner "root"


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

-package %w[
-  prometheus
-  prometheus-alertmanager
-]
-
-promscale_version = "0.11.0"
-promscale_extension_version = "0.5.0"
+promscale_version = "0.16.0"

 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
 
 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
 

+package %W[
+  prometheus
+  prometheus-alertmanager
+  promscale-extension-postgresql-#{database_version}
+]
+

 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true
 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true


@@ -125,19 +138,6 @@ directory "/opt/promscale" do
   mode "755"
 end
 
   mode "755"
 end
 

-remote_file "#{cache_dir}/promscale_extension.pg#{database_version}.x86_64.deb" do
-  source "https://github.com/timescale/promscale_extension/releases/download/#{promscale_extension_version}/promscale_extension-#{promscale_extension_version}.pg#{database_version}.x86_64.deb"
-  owner "root"
-  group "root"
-  mode "644"
-  backup false
-end
-
-dpkg_package "promscale-extension-postgresql-#{database_version}" do
-  source "#{cache_dir}/promscale_extension.pg#{database_version}.x86_64.deb"
-  version "#{promscale_extension_version}-1"
-end
-

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


@@ -158,10 +158,8 @@ systemd_service "promscale" do
   user "prometheus"
   exec_start "/opt/promscale/bin/promscale --db.uri postgresql:///promscale?host=/run/postgresql&port=5432 --db.connections-max 400"
   limit_nofile 16384
   user "prometheus"
   exec_start "/opt/promscale/bin/promscale --db.uri postgresql:///promscale?host=/run/postgresql&port=5432 --db.connections-max 400"
   limit_nofile 16384

-  private_tmp true
-  protect_system "strict"
-  protect_home true
-  no_new_privileges true
+  sandbox :enable_network => true
+  restrict_address_families "AF_UNIX"

 end
 
 if node[:prometheus][:promscale]
 end
 
 if node[:prometheus][:promscale]


@@ -205,11 +203,15 @@ 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]

+      scrape_interval = exporter[:scrape_interval]
+      scrape_timeout = exporter[:scrape_timeout]

       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
       sni = nil
       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
       sni = nil

+      scrape_interval = nil
+      scrape_timeout = nil

       metric_relabel = []
     end
 
       metric_relabel = []
     end
 


@@ -218,6 +220,8 @@ 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,

+      :scrape_interval => scrape_interval,
+      :scrape_timeout => scrape_timeout,

       :metric_relabel => metric_relabel
     }
   end
       :metric_relabel => metric_relabel
     }
   end


@@ -226,7 +230,7 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
     snmp_targets << {
       :instance => instance,
       :target => details[:address],
     snmp_targets << {
       :instance => instance,
       :target => details[:address],

-      :module => details[:module],
+      :modules => details[:modules],

       :address => client[:prometheus][:addresses]["snmp"],
       :labels => Array(details[:labels])
     }
       :address => client[:prometheus][:addresses]["snmp"],
       :labels => Array(details[:labels])
     }


@@ -262,7 +266,8 @@ end
 systemd_service "prometheus-executable" do
   service "prometheus"
   dropin "executable"
 systemd_service "prometheus-executable" do
   service "prometheus"
   dropin "executable"

-  exec_start "/opt/prometheus-server/prometheus/prometheus --config.file=/etc/prometheus/prometheus.yml --web.external-url=https://prometheus.openstreetmap.org/prometheus --storage.tsdb.path=/var/lib/prometheus/metrics2"
+  exec_start "/opt/prometheus-server/prometheus/prometheus --config.file=/etc/prometheus/prometheus.yml --web.external-url=https://prometheus.openstreetmap.org/prometheus --storage.tsdb.path=/var/lib/prometheus/metrics2 --storage.tsdb.retention.time=30d"
+  timeout_stop_sec 300

   notifies :restart, "service[prometheus]"
 end
 
   notifies :restart, "service[prometheus]"
 end
 


@@ -295,6 +300,10 @@ systemd_service "prometheus-alertmanager-executable" do
   notifies :restart, "service[prometheus-alertmanager]"
 end
 
   notifies :restart, "service[prometheus-alertmanager]"
 end
 

+link "/usr/local/bin/promtool" do
+  to "/opt/prometheus-server/prometheus/promtool"
+end
+

 template "/etc/prometheus/alertmanager.yml" do
   source "alertmanager.yml.erb"
   owner "root"
 template "/etc/prometheus/alertmanager.yml" do
   source "alertmanager.yml.erb"
   owner "root"


@@ -308,13 +317,23 @@ service "prometheus-alertmanager" do
   subscribes :restart, "archive_file[#{cache_dir}/alertmanager.linux-amd64.tar.gz]"
 end
 
   subscribes :restart, "archive_file[#{cache_dir}/alertmanager.linux-amd64.tar.gz]"
 end
 

-template "/etc/prometheus/amtool.yml" do
+directory "/etc/amtool" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+template "/etc/amtool/config.yml" do

   source "amtool.yml.erb"
   owner "root"
   group "root"
   mode "644"
 end
 
   source "amtool.yml.erb"
   owner "root"
   group "root"
   mode "644"
 end
 

+link "/usr/local/bin/amtool" do
+  to "/opt/prometheus-server/alertmanager/amtool"
+end
+

 template "/etc/prometheus/karma.yml" do
   source "karma.yml.erb"
   owner "root"
 template "/etc/prometheus/karma.yml" do
   source "karma.yml.erb"
   owner "root"


@@ -326,11 +345,7 @@ systemd_service "prometheus-karma" do
   description "Alert dashboard for Prometheus Alertmanager"
   user "prometheus"
   exec_start "/opt/prometheus-server/karma/karma-linux-amd64 --config.file=/etc/prometheus/karma.yml"
   description "Alert dashboard for Prometheus Alertmanager"
   user "prometheus"
   exec_start "/opt/prometheus-server/karma/karma-linux-amd64 --config.file=/etc/prometheus/karma.yml"

-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox :enable_network => true

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -338,6 +353,7 @@ service "prometheus-karma" do
   action [:enable, :start]
   subscribes :reload, "template[/etc/prometheus/karma.yml]"
   subscribes :restart, "archive_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
   action [:enable, :start]
   subscribes :reload, "template[/etc/prometheus/karma.yml]"
   subscribes :restart, "archive_file[#{cache_dir}/karma-linux-amd64.tar.gz]"

+  subscribes :restart, "systemd_service[prometheus-karma]"

 end
 
 package "grafana-enterprise"
 end
 
 package "grafana-enterprise"