Freeze break request: Add nagios internal monitoring for mm2 publiclist and fix mm2 static alias

[Patrick Uiterwijk]

Hi all,

Any +1s for these changes?
The static change is because currently all static assets are served through Flask (which
is highly inefficient and disables caching as it sends session cookies).

With kind regards,
Patrick Uiterwijk
Fedora Infra




diff --git a/roles/mirrormanager/frontend2/templates/mirrormanager.conf
b/roles/mirrormanager/frontend2/templates/mirrormanager.conf
index ce6b082..6f12c24 100644
--- a/roles/mirrormanager/frontend2/templates/mirrormanager.conf
+++ b/roles/mirrormanager/frontend2/templates/mirrormanager.conf
@@ -1,6 +1,6 @@
 # Apache configuration file for mirrormanager2
 
-Alias /mirrormanager2/static
/usr/lib/python2.7/site-packages/mirrormanager2/static/fedora/
+Alias /mirrormanager/static
/usr/lib/python2.7/site-packages/mirrormanager2/static/fedora/
 
 WSGIDaemonProcess mirrormanager user=apache maximum-requests=1000
display-name=mirrormanager processes=2 threads=1
 WSGISocketPrefix run/wsgi
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg
b/roles/nagios_server/files/nagios/services/websites.cfg
index 67f49e9..a9f4e70 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -44,6 +44,14 @@ define service {
 }
 
 define service {
+  host_name             mm-frontend01,mm-frontend01.stg
+  service_description   mm-publiclist-internal
+  check_command         check_website!localhost!/mirrormanager/
+  use                   internalwebsitetemplate
+  event_handler         restart_httpd
+}
+
+define service {
   host_name             proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo,
proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard, proxy05-fpo,
proxy10-fpo, proxy11-fpo
   service_description   start.fedoraproject.org
   check_command         check_website!start.fedoraproject.org!/!The Fedora Project is
maintained