apache-frontend: add monitoring stack

software/apache-frontend/common.cfg

@@ -14,6 +14,8 @@ extends =
   ../../component/logrotate/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/squid/buildout.cfg
+# Monitoring stack
+  ../../stack/monitor/buildout.cfg
 
 parts +=
   slapos-cookbook

software/apache-frontend/instance-apache-frontend.cfg

@@ -28,6 +28,28 @@ parts =
   promise-apache-frontend-v6-https
   promise-apache-frontend-v6-http
   promise-apache-cached
+## Monitoring part
+###Parts to add for monitoring
+  slap-parameters
+  certificate-authority
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-index
+  deploy-index-template
+  deploy-monitor-script
+  deploy-rss-script
+  deploy-settings-cgi
+  deploy-status-cgi
+  make-rss
+  monitor-promise
+  setup-static-files
+  certificate-authority
+  public
+  zero-parameters
+  public-symlink
+  cgi-httpd-wrapper
+
+extends = ${monitor-template:output}
 
 
 eggs-directory = ${buildout:eggs-directory}
@@ -142,6 +164,7 @@ extra-context =
     section logrotate_dict logrotate
     section frontend_configuration frontend-configuration
     section apache_configuration apache-configuration
+    section connection_information_dict publish-connection-informations
 
 [dynamic-custom-group-template-slave-list]
 < = jinja2-template-base

software/apache-frontend/templates/apache-custom-slave-list.cfg.in

@@ -172,6 +172,10 @@ private-ipv4 = {{ local_ipv4 }}
 {% if extra_slave_instance_list -%}
 slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list) }}
 {% endif -%}
+{% do connection_information_dict.pop('recipe') %}
+{% for key, value in connection_information_dict.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor %}
 
 {% do part_list.append('cached-rewrite-rules') -%}
 [cached-rewrite-rules]