Enable prometheus monitoring for more PHP-FPM sites

[chef.git] / cookbooks / squid / recipes / default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index ff2a6a4257079f95c691ef7a21c0c5eb83a29f15..deeff85b6373c5d1ba3657930fd32ba6b6b01c3e 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -19,6 +19,7 @@
 
 include_recipe "apt"
 include_recipe "munin"
 
 include_recipe "apt"
 include_recipe "munin"

+include_recipe "prometheus"

 
 if node[:squid][:version] >= 3
   apt_package "squid" do
 
 if node[:squid][:version] >= 3
   apt_package "squid" do


@@ -56,13 +57,13 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
   source "squid.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 Array(node[:squid][:cache_dir]).each do |cache_dir|
 end
 
 Array(node[:squid][:cache_dir]).each do |cache_dir|


@@ -75,7 +76,7 @@ Array(node[:squid][:cache_dir]).each do |cache_dir|
   directory cache_dir do
     owner "proxy"
     group "proxy"
   directory cache_dir do
     owner "proxy"
     group "proxy"

-    mode 0o750
+    mode "750"

     recursive true
     notifies :restart, "service[squid]"
   end
     recursive true
     notifies :restart, "service[squid]"
   end


@@ -94,15 +95,26 @@ file "/etc/systemd/system/squid.service" do
   action :delete
 end
 
   action :delete
 end
 

+file "/etc/logrotate.d/squid.dpkg-dist" do
+  action :delete
+end
+
+squid_service_exec = if node[:lsb][:release].to_f < 20.04
+                       "/usr/sbin/squid -YC"
+                     else
+                       "/usr/sbin/squid --foreground -YC"
+                     end
+

 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304
   private_tmp true
 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
   restart "always"
   protect_system "full"
   protect_home true
   restrict_address_families address_families
   restart "always"

+  exec_start "#{squid_service_exec}"

 end
 
 service "squid" do
 end
 
 service "squid" do


@@ -141,3 +153,8 @@ end
 munin_plugin "squid_delay_pools_noreferer" do
   action :delete
 end
 munin_plugin "squid_delay_pools_noreferer" do
   action :delete
 end

+
+prometheus_exporter "squid" do
+  port 9301
+  listen_switch "listen"
+end