fix, add monitoring for slapos master software release

software/slapos-master/instance-erp5.cfg.in

@@ -37,6 +37,7 @@ config-{{ option }} = {{ dumps(value) }}
 {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}) }}
 {{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}) }}
 {{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': mariadb_dict.get('tcpv4-port', 2099)}, {'database-list': True, 'test-database-list': True}) }}
+{{ request('http-monitor', 'http-monitor', 'http-monitor', {}, {'monitor-url': True}) }}
 {# Fail early if an unexpected value is provided -#}
 {% set zodb_type = slapparameter_dict.get('zodb-software-type') -%}
 {% set zodb_extern = slapparameter_dict.get('zodb-extern') -%}

software/slapos-master/instance-zope.cfg.in

@@ -78,12 +78,24 @@ ca-private = ${:ca-dir}/private
 ca-certs = ${:ca-dir}/certs
 ca-newcerts = ${:ca-dir}/newcerts
 ca-crl = ${:ca-dir}/crl
+logrotate-backup = ${:var}/logrotate
 
 [binary-link]
 recipe = slapos.cookbook:symbolic.link
 target-directory = ${directory:bin}
 link-binary = {{ dumps(parameter_dict['link-binary']) }}
 
+[{{ section('monitor-current-log-access') }}]
+< = monitor-directory-access
+source = ${directory:log}
+
+[{{ section('monitor-backup-log-access') }}]
+< = monitor-directory-access
+source = ${directory:logrotate-backup}
+
+[monitor-parameters]
+port = {{ slapparameter_dict['port-base'] + 5000 }}
+
 [certificate-authority-common]
 requests-directory = ${directory:ca-requests}
 ca-dir = ${directory:ca-dir}
@@ -363,6 +375,7 @@ dict toward erp5 partition, violating the DRY principle and making the intent
 hard to guess.
 -#}
 hosts-dict = {{ dumps(hosts_dict) }}
+monitor-url = ${monitor-parameters:url}
 
 [erp5-promise]
 recipe = slapos.cookbook:erp5.promise
@@ -379,9 +392,21 @@ certificate-authority-path = {{ dumps(slapparameter_dict['ca-path']) }}
 {% endif -%}
 
 [buildout]
-extends = {{ logrotate_cfg }}
+extends = 
+  {{ logrotate_cfg }}
+  {{ parameter_dict['template-monitor'] }}
 parts +=
   erp5-promise
+  certificate-authority
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-index
+  setup-static-files
+  public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
   {{ part_list | join('\n  ') }}
   publish-zope
 versions = versions

software/slapos-master/software.cfg

@@ -25,14 +25,14 @@ repository_id_list = erp5 vifib/master
 [erp5]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
-branch = erp5-slapos-upgrade
+branch = erp5-vifib
 git-executable = ${git:location}/bin/git
 revision = 
 
 [vifib]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
+branch = master-dev
 git-executable = ${git:location}/bin/git
 revision = 
 
@@ -72,7 +72,7 @@ mode = 644
 [template-erp5]
 < = download-base-part
 filename = instance-erp5.cfg.in
-md5sum = e75f791c031f042629858e7442d06964
+md5sum = 5f221cc3eee58e1541a86981f42d6d5f
 
 [template-balancer]
 < = download-base-part
@@ -82,7 +82,7 @@ md5sum = 2a8d46a2b1b8c2aae12e134cbcafa266
 [template-zope]
 < = download-base-part
 filename = instance-zope.cfg.in
-md5sum = 65bfa6ceaa4edcf90297e2ee0bf42032
+md5sum = 64566833e81dd4f7b5e5aad835982380
 
 [template-apache-conf]
 < = download-base-part

stack/erp5/buildout.cfg

@@ -56,9 +56,9 @@ extends =
   ../../component/6tunnel/buildout.cfg
   ../../component/findutils/buildout.cfg
   ../../component/userhosts/buildout.cfg
-  logrotate-base.cfg
   ../../stack/monitor/buildout.cfg
   ../../component/pycurl/buildout.cfg
+  logrotate-base.cfg
 
 parts =
   erp5-util-develop
@@ -157,11 +157,11 @@ context =
     key eggs_directory buildout:eggs-directory
     key slapos_core_version versions:slapos.core
     ${:extra-context}
-
+    
 [template-http-monitor]
 < = download-base
 filename = instance-http-monitor.cfg.in
-md5sum = 16d1fc3cf26c3066ae612ded0ec64cd2
+md5sum = 6598e036c140f65571f3f9e3faa5d008
 
 [template-mariadb]
 < = download-base
@@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 7cf16ce6d138c96b465eeeeee1f67465
+md5sum = 96fd81c0e3cb1d8f9afacab8bd719a0e
 extra-context =
     key mariadb_link_binary template-mariadb:link-binary
     key zope_link_binary template-zope:link-binary
@@ -297,7 +297,7 @@ extra-context =
 [template-erp5]
 < = download-base
 filename = instance-erp5.cfg.in
-md5sum = 386f5f15d71636f855f22201d38367e5
+md5sum = 6d36be642a5891624fae767adf68639e
 
 [template-zeo]
 < = download-base
@@ -593,6 +593,7 @@ branch = erp5-cluster
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
+  slapos.toolbox
   slapos.toolbox[check_web_page_http_cache_hit,zodbpack]
 
 scripts =

stack/erp5/instance-http-monitor.cfg.in

-{% if software_type == slap_software_type -%}
 [buildout]
 parts =
   certificate-authority
@@ -22,9 +21,6 @@ parts =
 
 extends = {{ parameter_dict["template-monitor"] }}
 
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-
 [monitor-check-web-page-http-cache-hit]
 recipe = slapos.cookbook:wrapper
 command-line = "{{ parameter_dict['bin-directory'] }}/check-web-page-http-cache-hit" -K "${public:filename}"
@@ -47,4 +43,3 @@ filename = ${public:filename}
 recipe = slapos.cookbook:publish.serialised
 monitor-url = ${monitor-parameters:url}
 
-{% endif %}

stack/erp5/instance-zope.cfg.in

@@ -388,8 +388,6 @@ bt5 = {{ dumps(slapparameter_dict['bt5']) }}
 bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
 
 [buildout]
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
 extends =
   {{ logrotate_cfg }}
   {{ parameter_dict['template-monitor'] }}

stack/erp5/instance.cfg.in

@@ -205,3 +205,4 @@ balancer = dynamic-template-balancer:rendered
 zodb-neo = dynamic-template-neo:rendered
 zodb-zeo = dynamic-template-zeo:rendered
 zope = dynamic-template-zope:rendered
+http-monitor = dynamic-template-http-monitor:rendered