From 9de422caa4b7971e91063611d0d43646eade6928 Mon Sep 17 00:00:00 2001 From: Hardik Juneja <hardik.juneja@nexedi.com> Date: Fri, 18 Aug 2017 17:26:48 +0200 Subject: [PATCH] software/slapos-master: fix slapos master to add parameters required for apachedex and mariadb promise /reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/215 --- software/slapos-master/buildout.hash.cfg | 2 +- software/slapos-master/instance-erp5.cfg.in | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg index 55513f1f2..459362eb7 100644 --- a/software/slapos-master/buildout.hash.cfg +++ b/software/slapos-master/buildout.hash.cfg @@ -15,7 +15,7 @@ # not need these here). [template-erp5] filename = instance-erp5.cfg.in -md5sum = 649137323f971026a6c62e357ce3f513 +md5sum = aa10af616493b97d2b630c46d869a9d7 [template-balancer] filename = instance-balancer.cfg.in diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in index 9eec40b80..9ad365b39 100644 --- a/software/slapos-master/instance-erp5.cfg.in +++ b/software/slapos-master/instance-erp5.cfg.in @@ -9,6 +9,7 @@ {% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%} {% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%} {% set monitor_base_url_dict = {} -%} +{% set monitor_dict = slapparameter_dict.get('monitor', {}) %} [request-common] <= request-common-base config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} @@ -42,7 +43,7 @@ config-name = {{ name }} {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} {{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} -{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} +{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', '') }, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} {% if has_posftix -%} {{ request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }} {%- else %} @@ -313,7 +314,9 @@ config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }} config-shared-certificate-authority-path = ${directory:ca-dir} config-monitor-passwd = ${monitor-htpasswd:passwd} config-name = ${:name} - +config-apachedex-promise-threshold = {{ dumps(monitor_dict.get('apachedex-promise-threshold', 70)) }} +config-apachedex-configuration = {{ dumps(monitor_dict.get('apachedex-configuration', + '--erp5-base "/erp5(/|$|/\?)" --skip-user-agent Zabbix --error-detail --js-embed --quiet')) }} [request-frontend-base] {% if has_frontend -%} -- 2.30.9