stack/erp5: Switch to monitor-promise-base

As possible cover promises in tests.

stack/erp5/buildout.hash.cfg

@@ -26,11 +26,11 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 591fe60e2f615c7690fa5078473b1b0a
+md5sum = b29449652ef996c267518e4dcfd8e9e1
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
-md5sum = 13315c109deab534b81e7a45e7320eea
+md5sum = e91c0fbd0df441884f7422fa7976053c
 
 [template-zope-conf]
 filename = zope.conf.in
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
 
 [template-postfix]
 filename = instance-postfix.cfg.in
-md5sum = cbcb5f4c2885e3f2589770e76a422be7
+md5sum = bbf84495576a3dbc522524895e9640ff
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.in
@@ -78,19 +78,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 2ebd2ed8b7db40c4ac6681a8dc0d792a
+md5sum = 939522bb26bf2109d7db818585a46f7a
 
 [template-zeo]
 filename = instance-zeo.cfg.in
-md5sum = 10a01b85c966ad9fe13bc981f1ddabe8
+md5sum = 0648e38bd5d3a15bb9f93264932740b9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 5eba2aa53af7ee74959745e6225ea0a7
+md5sum = b1685783f4c93da918ccc83702559e6f
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 10c620e934397390dc9b737453aab387
+md5sum = cfc9c1ad40bf215771f4902b2ea3fe5b
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -180,11 +180,12 @@ input = inline:
   kill -USR1 "$(cat '${apache-conf-parameter-dict:pid-file}')"
 
 [{{ section('apache-promise') }}]
+<= monitor-promise-base
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/apache
-hostname = {{ ipv4 }}
-port = {{ apache_dict.values()[0][0] }}
+module = check_port_listening
+name = apache.py
+config-hostname = {{ ipv4 }}
+config-port = {{ apache_dict.values()[0][0] }}
 
 [{{ section('publish') }}]
 recipe = slapos.cookbook:publish.serialised
@@ -209,7 +210,6 @@ recipe = slapos.cookbook:mkdirectory
 apache-conf = ${:etc}/apache
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
-promise = ${:etc}/promise
 services = ${:etc}/run
 services-on-watch = ${:etc}/service
 var = ${buildout:directory}/var
@@ -247,14 +247,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }}
 promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }}
 
 [{{ section('monitor-promise-apachedex-result') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-apachedex-result
-command-line = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
+<= monitor-promise-base
+module = check_command_execute
+name = check-apachedex-result.py
+config-command = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
 
 [{{ section('promise-check-computer-memory') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-erp5.cfg.in

@@ -65,7 +65,7 @@ config-name = {{ name }}
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
-promise = ${:etc}/promise
+plugin = ${:etc}/plugin
 service-on-watch = ${:etc}/service
 srv = ${buildout:directory}/srv
 backup-caucased = ${:srv}/backup/caucased

stack/erp5/instance-kumofs.cfg.in

@@ -72,7 +72,7 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log} ${
 recipe = slapos.cookbook:mkdirectory
 log = ${buildout:directory}/var/log
 services = ${buildout:directory}/etc/run
-promise = ${buildout:directory}/etc/promise
+plugin = ${buildout:directory}/etc/plugin
 srv = ${buildout:directory}/srv
 kumofs-data = ${:srv}/kumofs
 
@@ -85,34 +85,36 @@ rendered = ${directory:srv}/exporter.exclude
 
 # Deploy zope promises scripts
 [promise-template]
-recipe = slapos.cookbook:check_port_listening
-hostname = ${kumofs-instance:ip}
-port = ${kumofs-instance:server-listen-port}
+<= monitor-promise-base
+module = check_port_listening
+config-hostname = ${kumofs-instance:ip}
+config-port = ${kumofs-instance:server-listen-port}
 
 [promise-kumofs-server]
 <= promise-template
-path = ${directory:promise}/kumofs-server
-port = ${kumofs-instance:server-port}
+name = kumofs-server.py
+config-port = ${kumofs-instance:server-port}
 
 [promise-kumofs-server-listen]
 <= promise-template
-path = ${directory:promise}/kumofs-server-listen
-port = ${kumofs-instance:server-listen-port}
+name = kumofs-server-listen.py
+config-port = ${kumofs-instance:server-listen-port}
 
 [promise-kumofs-gateway]
 <= promise-template
-path = ${directory:promise}/kumofs-gateway
-port = ${kumofs-instance:gateway-port}
+name = kumofs-gateway.py
+config-port = ${kumofs-instance:gateway-port}
 
 [promise-kumofs-manager]
 <= promise-template
-path = ${directory:promise}/kumofs-manager
-port = ${kumofs-instance:manager-port}
+name = kumofs-manager.py
+config-port = ${kumofs-instance:manager-port}
 
 [promise-check-computer-memory]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-mariadb.cfg.in

@@ -252,7 +252,7 @@ recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
 services = ${:etc}/run
-promise = ${:etc}/promise
+plugin = ${:etc}/plugin
 srv = ${buildout:directory}/srv
 tmp = ${buildout:directory}/tmp
 backup = ${:srv}/backup
@@ -333,19 +333,22 @@ max_queries_threshold = {{ slapparameter_dict['max-slowqueries-threshold'] }}
 slowest_queries_threshold = {{ slapparameter_dict['slowest-query-threshold'] }}
 
 [{{ section('monitor-promise-slowquery-result') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-slow-query-pt-digest-result
-command-line = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}" --ptdigest_path "${directory:slowquery}" --status_file ${monitor-directory:private}/mariadb_slow_query.report.json --max_queries_threshold "${slow-query-digest-parameters:max_queries_threshold}" --slowest_query_threshold "${slow-query-digest-parameters:slowest_queries_threshold}"
+<= monitor-promise-base
+module = check_command_execute
+name = check-slow-query-pt-digest-result.py
+config-command = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}" --ptdigest_path "${directory:slowquery}" --status_file ${monitor-directory:private}/mariadb_slow_query.report.json --max_queries_threshold "${slow-query-digest-parameters:max_queries_threshold}" --slowest_query_threshold "${slow-query-digest-parameters:slowest_queries_threshold}"
 
 [{{ section('promise-check-computer-memory') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 [{{ section('promise') }}]
-recipe = slapos.cookbook:wrapper
-command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}"
-wrapper-path = ${directory:promise}/mariadb
+<= monitor-promise-base
+module = check_command_execute
+name = mariadb.py
+config-command = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}"
 
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-postfix.cfg.in

@@ -29,7 +29,7 @@ url = {{ dumps('smtp://' ~ urllib.quote_plus(smtpd_sasl_user) ~ ':' ~ urllib.quo
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
-promise = ${:etc}/promise
+plugin = ${:etc}/plugin
 etc-postfix = ${:etc}/postfix
 etc-cyrus = ${:etc}/cyrus
 run = ${:etc}/run
@@ -79,10 +79,11 @@ wrapper-path = ${directory:run}/munnel
 {%   do milter_list.append(socket) -%}
 
 [{{ section('munnel-promise') }}]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/munnel
-hostname = {{ ip }}
-port = {{ milter_port }}
+<= monitor-promise-base
+module = check_port_listening
+name = munnel.py
+config-hostname = {{ ip }}
+config-port = {{ milter_port }}
 {% endif -%}
 
 [configuration]
@@ -260,15 +261,17 @@ command-line = ${directory:usr}/libexec/postfix/master
 wrapper-path = ${directory:run}/postfix-master
 
 [{{ section('postfix-promise') }}]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/postfix
-hostname = {{ ip }}
-port = {{ tcpv4_port }}
+<= monitor-promise-base
+module = check_port_listening
+name = postfix.py
+config-hostname = {{ ip }}
+config-port = {{ tcpv4_port }}
 
 [{{ section('promise-check-computer-memory') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-zeo.cfg.in

@@ -54,10 +54,11 @@ log = {{ "${" ~ zeo_section_name ~ ":log-path}" }}
 post = test ! -s {{ "${" ~ zeo_section_name ~":pid-path}" }} || {{ bin_directory }}/slapos-kill --pidfile {{ "${" ~ zeo_section_name ~ ":pid-path}" }} -s USR2
 
 [{{ section(zeo_section_name ~ "-promise") }}]
-recipe = slapos.cookbook:check_port_listening
-hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
-port = {{ "${" ~ zeo_section_name ~ ":port}" }}
-path = ${directory:promises}/zeo-{{ family }}
+<= monitor-promise-base
+module = check_port_listening
+name = zeo-{{ family }}.py
+config-hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
+config-port = {{ "${" ~ zeo_section_name ~ ":port}" }}
 
 {% endfor -%}
 
@@ -87,10 +88,11 @@ repozo-wrapper = ${buildout:bin-directory}/tidstorage-repozo
 tidstorage-wrapper = ${directory:services}/tidstoraged
 
 [{{ section("promise-tidstorage") }}]
-recipe = slapos.cookbook:check_port_listening
-hostname = ${tidstorage:ip}
-port = ${tidstorage:port}
-path = ${directory:promises}/tidstorage
+<= monitor-promise-base
+module = check_port_listening
+name = tidstorage.py
+config-hostname = ${tidstorage:ip}
+config-port = ${tidstorage:port}
 {% endif -%}
 
 [{{ section("cron-entry-tidstorage-backup") }}]
@@ -174,9 +176,10 @@ mode = 755
 {% endif -%}
 
 [{{ section('promise-check-computer-memory') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promises}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 [publish]
 recipe = slapos.cookbook:publish.serialised
@@ -195,7 +198,7 @@ recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
 services = ${:etc}/run
-promises = ${:etc}/promise
+plugin = ${:etc}/plugin
 srv = ${buildout:directory}/srv
 var = ${buildout:directory}/var
 log = ${:var}/log

stack/erp5/instance-zope.cfg.in

@@ -86,7 +86,7 @@ srv = ${buildout:directory}/srv
 ca-dir = ${:srv}/ssl
 tmp = ${buildout:directory}/tmp
 var = ${buildout:directory}/var
-promises = ${:etc}/promise
+plugin = ${:etc}/plugin
 unit-test-path = ${:srv}/test-instance/unit_test
 
 # Used for ERP5 resiliency or (more probably)
@@ -326,10 +326,11 @@ port = {{ port }}
 {%- endif %}
 
 [{{ section("promise-" ~ name) }}]
-recipe = slapos.cookbook:check_port_listening
-hostname = {{ ipv4 }}
-port = {{ port }}
-path = ${directory:promises}/{{ name }}
+<= monitor-promise-base
+module = check_port_listening
+name = {{ name }}.py
+config-hostname = {{ ipv4 }}
+config-port = {{ port }}
 
 {% set extra_path_list = [] -%}
 {% set shell_escaped_extra_path_list = [] -%}
@@ -339,9 +340,10 @@ path = ${directory:promises}/{{ name }}
 {%   do shell_escaped_extra_path_list.append(line.replace("\x27", "\x27\\\x27\x27")) -%}
 {% endfor -%}
 [{{ section("promise-" ~ name ~ "-is-running-actual-product") }}]
-recipe = slapos.cookbook:wrapper
-command-line = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }}
-wrapper-path = ${directory:promises}/{{ name }}-is-running-actual-product
+<= monitor-promise-base
+module = check_command_execute
+name = {{ name }}-is-running-actual-product.py
+config-command = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }}
 
 {% if use_ipv6 -%}
 [{{ zope_tunnel_section_name }}]
@@ -352,26 +354,23 @@ ipv4-port = {{ port }}
 {%   do publish_list.append(("[" ~ ipv6 ~ "]:" ~ port, thread_amount, webdav)) -%}
 
 [{{ section("promise-tunnel-" ~ name) }}]
-recipe = slapos.cookbook:check_port_listening
-hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
-port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }}
-path = ${directory:promises}/{{ zope_tunnel_base_name }}
+<= monitor-promise-base
+module = check_port_listening
+name = {{ zope_tunnel_base_name }}.py
+config-hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
+config-port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }}
 {% else -%}
 {%   do publish_list.append((ipv4 ~ ":" ~ port, thread_amount, webdav)) -%}
 {% endif -%}
 
 {% if longrequest_logger_interval > 0 -%}
 [{{ section('promise-check-' ~name ~ '-longrequest-error-log') }}]
-recipe = slapos.cookbook:promise.plugin
-eggs =
-  slapos.toolbox
-output = ${directory:plugins}/{{'check-' ~ name ~ '-longrequest-error-log.py'}}
-content =
-  from slapos.promise.plugin.check_error_on_zope_longrequest_log import RunPromise
+<= monitor-promise-base
+module = check_error_on_zope_longrequest_log
+name = {{'check-' ~ name ~ '-longrequest-error-log.py'}}
 config-log-file = {{ '${' ~ conf_parameter_name ~ ':longrequest-logger-file}' }}
 config-error-threshold = {{ slapparameter_dict["zope-longrequest-logger-error-threshold"] }}
 config-maximum-delay = {{ slapparameter_dict["zope-longrequest-logger-maximum-delay"] }}
-mode = 600
 {% endif -%}
 
 [{{ section('logrotate-entry-' ~ name) }}]
@@ -494,21 +493,28 @@ environment-extra +=
   zserver_address_list={{ ','.join(zserver_address_list) }}
   zserver_frontend_url_list={{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }}
 
-[{{ section("promise-test-runner-apache-url") }}]
+[promise-test-runner-apache-url-executable]
 # promise to wait for apache partition to have returned the parameter
 recipe = slapos.cookbook:check_parameter
 value = {{ slapparameter_dict['test-runner-apache-url-list'] }}
 expected-not-value = not-ready
-path = ${directory:promises}/${:_buildout_section_name_}
+path = ${directory:bin}/${:_buildout_section_name_}
 expected-value =
 
+[{{ section("promise-test-runner-apache-url") }}]
+<= monitor-promise-base
+module = check_command_execute
+name = ${:_buildout_section_name_}.py
+config-command = ${promise-test-runner-apache-url-executable:path}
+
 {%-   endif %}
 {%- endif %}
 
 [{{ section('promise-check-computer-memory') }}]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:promises}/check-computer-memory
-command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
+<= monitor-promise-base
+module = check_command_execute
+name = check-computer-memory.py
+config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
 
 
 [publish]