stack/erp5: update apachedex and slowquery result checks as per new promises

stack/erp5/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = cfe6ab8ae54a521ecb269e9d9762cbeb
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 5c11abdef0c84cdef91f999490786244
+md5sum = f868a5e1233f0b66d0c944accb3fc765
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -87,7 +87,7 @@ md5sum = 27d26c6380883cf3bd7b2f003f7888d8
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = a93c7fae7402db91142cc73e5af55c6c
+md5sum = f64c568f1365eb1164f12f48fede9a99
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -288,7 +288,7 @@ apachedex = ${monitor-directory:private}/apachedex
 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 = apachedex_every_3_hour
+command = apachedex_every_23_hour
 
 [apachedex-parameters]
 # XXX - Sample log file with curent date: apache_access.log-%(date)s.gz
@@ -300,7 +300,7 @@ 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_file "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
+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-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-mariadb.cfg.in

@@ -252,6 +252,7 @@ mariadb-ssl = ${:etc}/mariadb-ssl
 var = ${buildout:directory}/var
 log = ${:var}/log
 run = ${:var}/run
+slowquery =  ${monitor-directory:private}/slowquerydex
 
 [{{ section('resiliency-exclude-file') }}]
 # Generate rdiff exclude file in case of resiliency
@@ -288,7 +289,7 @@ context =
   raw slow_query_path ${directory:srv}/backup/logrotate/mariadb_slowquery.log
   raw pt_query_exec ${binary-wrap-pt-digest:wrapper-path}
   raw dash {{ parameter_dict['dash-location'] }}/bin/dash
-  key output_folder monitor-directory:private
+  key output_folder directory:slowquery
 
 [slow-query-digest-parameters]
 max_queries_threshold = {{ slapparameter_dict['max-slowqueries-threshold'] }}
@@ -297,7 +298,7 @@ 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_file "${monitor-directory:private}/slowquery_digest.txt" --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}"
+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}"
 
 
 [{{ section('promise') }}]