From 6229807b70d0e510eefbac192fb03b19c51b9975 Mon Sep 17 00:00:00 2001 From: Lukasz Nowak <luke@nexedi.com> Date: Fri, 27 Sep 2019 16:50:12 +0200 Subject: [PATCH] software/slapos-master: Switch to monitor-promise-base --- software/slapos-master/buildout.hash.cfg | 4 ++-- .../slapos-master/instance-balancer.cfg.in | 24 ++++++++++--------- software/slapos-master/instance-erp5.cfg.in | 1 - 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg index d0ee80f83..f62de7852 100644 --- a/software/slapos-master/buildout.hash.cfg +++ b/software/slapos-master/buildout.hash.cfg @@ -14,11 +14,11 @@ # not need these here). [template-erp5] filename = instance-erp5.cfg.in -md5sum = e46c20fa51e15972b225731b83b09889 +md5sum = 2ef0ddc206c6b0982a37cfc21f23e423 [template-balancer] filename = instance-balancer.cfg.in -md5sum = e8033d4fd7b6348b525a6148762ccdb4 +md5sum = ef86e09e44ac67a9b15939df0ab4a466 [template-apache-backend-conf] filename = apache-backend.conf.in diff --git a/software/slapos-master/instance-balancer.cfg.in b/software/slapos-master/instance-balancer.cfg.in index 38cfef0d6..5f4ee6050 100644 --- a/software/slapos-master/instance-balancer.cfg.in +++ b/software/slapos-master/instance-balancer.cfg.in @@ -187,10 +187,11 @@ input = inline: [{{ section('apache-promise') }}] # 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] }} +<= monitor-promise-base +module = check_port_listening +name = apache.py +config-hostname = {{ ipv4 }} +config-port = {{ apache_dict.values()[0][0] }} [{{ section('publish') }}] recipe = slapos.cookbook:publish.serialised @@ -229,7 +230,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 @@ -273,14 +273,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] }} diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in index c9690ae52..9aa4bd02c 100644 --- a/software/slapos-master/instance-erp5.cfg.in +++ b/software/slapos-master/instance-erp5.cfg.in @@ -65,7 +65,6 @@ config-name = {{ name }} [directory] recipe = slapos.cookbook:mkdirectory etc = ${buildout:directory}/etc -promise = ${:etc}/promise service-on-watch = ${:etc}/service srv = ${buildout:directory}/srv backup-caucased = ${:srv}/backup/caucased -- 2.30.9