X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b0fa48094234e76b98eff642e0339c3626c7bfeb..a69e5044af461270dd9d154fab75f0596b15229b:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 37352b2c9..deeff85b6 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -19,6 +19,7 @@
 
 include_recipe "apt"
 include_recipe "munin"
+include_recipe "prometheus"
 
 if node[:squid][:version] >= 3
   apt_package "squid" do
@@ -101,14 +102,14 @@ end
 squid_service_exec = if node[:lsb][:release].to_f < 20.04
                        "/usr/sbin/squid -YC"
                      else
-                       "/usr/sbin/squid --foreground -sYC"
+                       "/usr/sbin/squid --foreground -YC"
                      end
 
 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304
   private_tmp true
-  private_devices true
+  private_devices node[:squid][:private_devices]
   protect_system "full"
   protect_home true
   restrict_address_families address_families
@@ -116,11 +117,6 @@ systemd_service "squid" do
   exec_start "#{squid_service_exec}"
 end
 
-# Quick hack to cleanup bloated journal
-execute "tmp_journal_clean_up" do
-  command "/bin/journalctl --vacuum-time=1d"
-end
-
 service "squid" do
   action :enable
   subscribes :restart, "systemd_service[squid]"
@@ -157,3 +153,8 @@ end
 munin_plugin "squid_delay_pools_noreferer" do
   action :delete
 end
+
+prometheus_exporter "squid" do
+  port 9301
+  listen_switch "listen"
+end