From a049bef140697e424804e65f78645449b3b0b6e9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 18 Nov 2020 17:01:35 +0000 Subject: [PATCH] Enable prometheus monitoring for more PHP-FPM sites --- cookbooks/blog/recipes/default.rb | 1 + cookbooks/civicrm/recipes/default.rb | 1 + cookbooks/dmca/recipes/default.rb | 1 + cookbooks/donate/recipes/default.rb | 1 + cookbooks/foundation/recipes/board.rb | 1 + cookbooks/foundation/recipes/dwg.rb | 1 + cookbooks/foundation/recipes/mwg.rb | 1 + cookbooks/foundation/recipes/wiki.rb | 1 + cookbooks/stateofthemap/recipes/default.rb | 6 ++++++ 9 files changed, 14 insertions(+) diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb index 2dd9e5f4d..2f80e2b13 100644 --- a/cookbooks/blog/recipes/default.rb +++ b/cookbooks/blog/recipes/default.rb @@ -38,6 +38,7 @@ wordpress_site "blog.openstreetmap.org" do urls "/casts" => "/srv/blog.openstreetmap.org/casts", "/images" => "/srv/blog.openstreetmap.org/images", "/static" => "/srv/blog.openstreetmap.org/static" + fpm_prometheus_port 11401 end wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 802294116..c0542a635 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -49,6 +49,7 @@ wordpress_site "join.osmfoundation.org" do database_name "civicrm" database_user "civicrm" database_password database_password + fpm_prometheus_port 11301 end wordpress_theme "osmblog-wp-theme" do diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb index 00a3d6c7d..f7f9cfadb 100644 --- a/cookbooks/dmca/recipes/default.rb +++ b/cookbooks/dmca/recipes/default.rb @@ -47,6 +47,7 @@ end php_fpm "dmca.openstreetmap.org" do php_admin_values "open_basedir" => "/srv/dmca.openstreetmap.org/html/:/usr/share/php/:/tmp/", "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open" + prometheus_port 11201 end apache_site "dmca.openstreetmap.org" do diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb index daa31fe4c..7389db3cf 100644 --- a/cookbooks/donate/recipes/default.rb +++ b/cookbooks/donate/recipes/default.rb @@ -83,6 +83,7 @@ end php_fpm "donate.openstreetmap.org" do php_admin_values "open_basedir" => "/srv/donate.openstreetmap.org/:/usr/share/php/:/tmp/", "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open" + prometheus_port 11101 end apache_site "donate.openstreetmap.org" do diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb index 7aeabd092..84d6b24b1 100644 --- a/cookbooks/foundation/recipes/board.rb +++ b/cookbooks/foundation/recipes/board.rb @@ -25,6 +25,7 @@ mediawiki_site "board.osmfoundation.org" do sitename "OSMF Board Wiki" metanamespace "OSMFBoard" directory "/srv/board.osmfoundation.org" + fpm_prometheus_port 11004 database_name "board-wiki" database_user "board-wikiuser" database_password passwords["board"]["database"] diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb index 12771db69..2eff0db56 100644 --- a/cookbooks/foundation/recipes/dwg.rb +++ b/cookbooks/foundation/recipes/dwg.rb @@ -25,6 +25,7 @@ mediawiki_site "dwg.osmfoundation.org" do sitename "OSMF Data Working Group Wiki" metanamespace "OSMFDWG" directory "/srv/dwg.osmfoundation.org" + fpm_prometheus_port 11002 database_name "dwg-wiki" database_user "dwg-wikiuser" database_password passwords["dwg"]["database"] diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb index df6f860ce..60bb76fd9 100644 --- a/cookbooks/foundation/recipes/mwg.rb +++ b/cookbooks/foundation/recipes/mwg.rb @@ -25,6 +25,7 @@ mediawiki_site "mwg.osmfoundation.org" do sitename "OSMF Membership Working Group Wiki" metanamespace "OSMFMWG" directory "/srv/mwg.osmfoundation.org" + fpm_prometheus_port 11003 database_name "mwg_wiki" database_user "mwg_wikiuser" database_password passwords["mwg"]["database"] diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index 06dffd216..f28674feb 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -26,6 +26,7 @@ mediawiki_site "wiki.osmfoundation.org" do "foundation.openstreetmap.org", "foundation.osm.org"] sitename "OpenStreetMap Foundation" directory "/srv/wiki.osmfoundation.org" + fpm_prometheus_port 11001 database_name "osmf-wiki" database_user "osmf-wikiuser" database_password passwords["wiki"]["database"] diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb index d0bdee0d5..39d537eea 100644 --- a/cookbooks/stateofthemap/recipes/default.rb +++ b/cookbooks/stateofthemap/recipes/default.rb @@ -55,6 +55,7 @@ wordpress_site "2007.stateofthemap.org" do database_user "sotm2007" database_password passwords["sotm2007"] database_prefix "wp_sotm_" + fpm_prometheus_port 12007 end wordpress_theme "2007.stateofthemap.org-refreshwp-11" do @@ -82,6 +83,7 @@ wordpress_site "2008.stateofthemap.org" do database_user "sotm2008" database_password passwords["sotm2008"] database_prefix "wp_sotm08_" + fpm_prometheus_port 12008 end wordpress_theme "2008.stateofthemap.org-refreshwp-11" do @@ -120,6 +122,7 @@ wordpress_site "2009.stateofthemap.org" do urls "/register" => "/srv/2009.stateofthemap.org/register", "/register-pro-user" => "/srv/2009.stateofthemap.org/register-pro-user", "/podcasts" => "/srv/2009.stateofthemap.org/podcasts" + fpm_prometheus_port 12009 end wordpress_theme "2009.stateofthemap.org-aerodrome" do @@ -156,6 +159,7 @@ wordpress_site "2010.stateofthemap.org" do database_user "sotm2010" database_password passwords["sotm2010"] urls "/register" => "/srv/2010.stateofthemap.org/register" + fpm_prometheus_port 12010 end wordpress_theme "2010.stateofthemap.org-aerodrome" do @@ -199,6 +203,7 @@ wordpress_site "2011.stateofthemap.org" do database_user "sotm2011" database_password passwords["sotm2011"] urls "/register" => "/srv/2011.stateofthemap.org/register" + fpm_prometheus_port 12011 end wordpress_theme "2011.stateofthemap.org-aerodrome" do @@ -242,6 +247,7 @@ wordpress_site "2012.stateofthemap.org" do database_user "sotm2012" database_password passwords["sotm2012"] urls "/register" => "/srv/2012.stateofthemap.org/register" + fpm_prometheus_port 12012 end wordpress_theme "2012.stateofthemap.org-aerodrome" do -- 2.39.5