From 71670f2a286685bafa96bb5646f7f8c3e7f75221 Mon Sep 17 00:00:00 2001
From: Tristan Cavelier <tristan.cavelier@nexedi.com>
Date: Fri, 22 Dec 2017 15:29:07 +0100
Subject: [PATCH] stack/erp5: fix apachedex monitor report
instance-erp5.cfg.in:
quoted values should not be part of the configuration parameters
https://lab.nexedi.com/nexedi/slapos.toolbox/blob/beb86eab2dee7178aa6e4795da0f56bb6cacaea1/slapos/apachedex.py#L62
modify default apachedex parameters
--erp5-base +erp5 .*/VirtualHostRoot/erp5(/|\?|$)
--base +other /
instance-balancer.cfg.in:
option `--configuration` should be used instead of `--config`
https://lab.nexedi.com/nexedi/slapos.toolbox/blob/beb86eab2dee7178aa6e4795da0f56bb6cacaea1/slapos/apachedex.py#L76
---
stack/erp5/instance-balancer.cfg.in | 2 +-
stack/erp5/instance-erp5.cfg.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/stack/erp5/instance-balancer.cfg.in b/stack/erp5/instance-balancer.cfg.in
index cec004f71f..55206a1b5b 100644
--- a/stack/erp5/instance-balancer.cfg.in
+++ b/stack/erp5/instance-balancer.cfg.in
@@ -287,7 +287,7 @@ apachedex = ${monitor-directory:private}/apachedex
[{{ section('monitor-generate-apachedex-report') }}]
recipe = slapos.cookbook:wrapper
wrapper-path = ${monitor-directory:reports}/${:command}
-command-line = "{{ parameter_dict['run-apachedex-location'] }}" "{{ parameter_dict['apachedex-location'] }}" "${directory:apachedex}" ${monitor-publish-parameters:monitor-base-url}/private/apachedex --apache-log-list "${apachedex-parameters:apache-log-list}" --config "${apachedex-parameters:configuration}"
+command-line = "{{ parameter_dict['run-apachedex-location'] }}" "{{ parameter_dict['apachedex-location'] }}" "${directory:apachedex}" ${monitor-publish-parameters:monitor-base-url}/private/apachedex --apache-log-list "${apachedex-parameters:apache-log-list}" --configuration "${apachedex-parameters:configuration}"
command = apachedex_every_23_hour
[apachedex-parameters]
diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in
index 2afebc4389..4fd25a611e 100644
--- a/stack/erp5/instance-erp5.cfg.in
+++ b/stack/erp5/instance-erp5.cfg.in
@@ -284,7 +284,7 @@ config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
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')) }}
+'--erp5-base +erp5 .*/VirtualHostRoot/erp5(/|\\?|$) --base +other / --skip-user-agent Zabbix --error-detail --js-embed --quiet')) }}
[request-frontend-base]
{% if has_frontend -%}
--
2.30.9