Fix PCI address identification for megaraid controllers

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index ffa03c34cbfbdae28b2c7649ab6da7281f3bd4b1..c927b87b5015c539583bc19dde39c1162f542421 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+include_recipe "prometheus"
 include_recipe "ssl"
 
 package %w[
@@ -49,11 +51,13 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 service "apache2" do
   action [:enable, :start]
+  retries 2
+  retry_delay 10
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -67,6 +71,10 @@ apache_module "status" do
   variables :hosts => admins["hosts"]
 end
 
+apache_module "brotli" do
+  conf "brotli.conf.erb"
+end
+
 apache_module "deflate" do
   conf "deflate.conf.erb"
 end
@@ -91,3 +99,9 @@ end
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"
+
+prometheus_exporter "apache" do
+  port 9117
+  listen_switch "telemetry.address"
+  options "--scrape_uri=http://localhost/server-status?auto"
+end