monitor-directory:promises and monitor-directory:reports are deprecated

Remove all references to deprecated directories. The promises inside monitor-directory:promises directory are not run anymore by slapgrid. The scripts inside monitor-directory:reports are not run either.

In this PR, we just update the directory location:
 * promise directory is now etc/promise (${directory:promise})
 * reports directory is now bin (${directory:bin})

/cc @alain.takoudjou @rafael

/reviewed-on !490

software/apache-frontend/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 274788ae9701ee1aabe26d1237f174e7
+md5sum = d6398d727eb1e1bc3df1768a9b9a7e0c
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -198,8 +198,8 @@ extra-context =
     section apache_configuration apache-configuration
     section nginx_configuration nginx-configuration
     key monitor_base_url monitor-instance-parameter:monitor-base-url 
-    key promise_directory monitor-directory:promises
-    key report_directory monitor-directory:reports
+    key promise_directory directory:promises
+    key report_directory directory:bin
     raw bin_directory ${buildout:bin-directory}
 
 [dynamic-virtualhost-template-slave]
@@ -632,7 +632,7 @@ private-path-list +=
 [monitor-traffic-summary-last-stats-wrapper]
 < = jinja2-template-base
 template = ${template-wrapper:output}
-rendered = $${monitor-directory:reports}/traffic-summary-last-stats_every_1_hour
+rendered = $${directory:bin}/traffic-summary-last-stats_every_1_hour
 mode = 0700
 command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_logstats -f $${trafficserver-directory:log}/squid.blog)</pre>"
 extra-context =
@@ -642,7 +642,7 @@ extra-context =
 [monitor-ats-cache-stats-wrapper]
 < = jinja2-template-base
 template = ${template-wrapper:output}
-rendered = $${monitor-directory:reports}/ats-cache-stats_every_1_hour
+rendered = $${directory:bin}/ats-cache-stats_every_1_hour
 mode = 0700
 command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_shell $${monitor-ats-cache-stats-config:rendered})</pre>"
 extra-context =
@@ -651,7 +651,7 @@ extra-context =
 [monitor-apache-server-status-wrapper]
 < = jinja2-template-base
 template = ${template-wrapper:output}
-rendered = $${monitor-directory:reports}/monitor-apache-server-status-wrapper
+rendered = $${directory:bin}/monitor-apache-server-status-wrapper
 mode = 0700
 command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-instance-parameter:username}:$${monitor-htpasswd:passwd} 2>&1
 extra-context =

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = db61a7c0aadba180b7aec6056d2c0019
+md5sum = 47150a0f4c9ff6f71753b93e03db05e7
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -194,8 +194,8 @@ extra-context =
     section caddy_configuration caddy-configuration
     section nginx_configuration nginx-configuration
     key monitor_base_url monitor-instance-parameter:monitor-base-url 
-    key promise_directory monitor-directory:promises
-    key report_directory monitor-directory:reports
+    key promise_directory directory:promises
+    key report_directory directory:bin
     key bin_directory :bin_directory
     key login_certificate ca-frontend:cert-file
     key login_key ca-frontend:key-file
@@ -666,7 +666,7 @@ private-path-list +=
 [monitor-traffic-summary-last-stats-wrapper]
 < = jinja2-template-base
 template = {{ parameter_dict['template_wrapper'] }}
-rendered = ${monitor-directory:reports}/traffic-summary-last-stats_every_1_hour
+rendered = ${directory:bin}/traffic-summary-last-stats_every_1_hour
 mode = 0700
 command = export TS_ROOT=${buildout:directory} && echo "<pre>$({{ parameter_dict['trafficserver'] }}/bin/traffic_logstats -f ${trafficserver-directory:log}/squid.blog)</pre>"
 extra-context =
@@ -676,7 +676,7 @@ extra-context =
 [monitor-ats-cache-stats-wrapper]
 < = jinja2-template-base
 template = {{ parameter_dict['template_wrapper'] }}
-rendered = ${monitor-directory:reports}/ats-cache-stats_every_1_hour
+rendered = ${directory:bin}/ats-cache-stats_every_1_hour
 mode = 0700
 command = export TS_ROOT=${buildout:directory} && echo "<pre>$({{ parameter_dict['trafficserver'] }}/bin/traffic_shell ${monitor-ats-cache-stats-config:rendered})</pre>"
 extra-context =
@@ -685,7 +685,7 @@ extra-context =
 [monitor-caddy-server-status-wrapper]
 < = jinja2-template-base
 template = {{ parameter_dict['template_wrapper'] }}
-rendered = ${monitor-directory:reports}/monitor-caddy-server-status-wrapper
+rendered = ${directory:bin}/monitor-caddy-server-status-wrapper
 mode = 0700
 command = {{ parameter_dict['curl'] }}/bin/curl -s http://{{ instance_parameter['ipv4-random'] }}:${configuration:plain_http_port}/server-status -u ${monitor-instance-parameter:username}:${monitor-htpasswd:passwd} 2>&1
 extra-context =

software/caddy-frontend/test/test.py

@@ -275,13 +275,6 @@ class TestDataMixin(object):
 
     self.assertTestData(runtime_data)
 
-  def test_monitor_promise_list(self):
-    runtime_data = '\n'.join(sorted([
-      q[len(self.instance_path) + 1:]
-      for q in glob.glob(os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise', '*'))]))
-    self.assertTestData(runtime_data)
-
   def _test_file_list(self, slave_dir, IGNORE_PATH_LIST):
     runtime_data = []
     for slave_var in glob.glob(os.path.join(self.instance_path, '*', 'var')):
@@ -1034,10 +1027,6 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
         q for q in os.listdir(os.path.join(partition_path, 'etc', 'plugin'))
         if not q.endswith('.pyc')]))
 
-    self.assertEqual(
-      set(),
-      set(os.listdir(os.path.join(partition_path, 'etc', 'monitor-promise'))))
-
     # check that monitor cors domains are correctly setup by file presence, as
     # we trust monitor stack being tested in proper place and it is too hard
     # to have working monitor with local proxy
@@ -2412,7 +2401,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_monitor-ipv6-test-ipv6-packet-list-test'))[0]
     self.assertEqual(
       '-a monitor-ipv6-test',
@@ -2454,7 +2443,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_monitor-ipv4-test-ipv4-packet-list-test'))[0]
     self.assertEqual(
       '-4 -a monitor-ipv4-test',
@@ -2497,7 +2486,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_re6st-optimal-test-re6st-optimal-test'))[0]
     self.assertEqual(
       '-4 ipv4 -6 ipv6',
@@ -3845,7 +3834,7 @@ https://www.google.com {}""",
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_re6st-optimal-test-unsafe-re6st-optimal-test'))[0]
 
     # Note: The result is a bit differnt from the request (newlines stripped),
@@ -3883,7 +3872,7 @@ https://www.google.com {}""",
     # assert that there is no nocomma file
     monitor_file_list = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_re6st-optimal-test-nocomma-re6st-optimal-test'))
     self.assertEqual(
       [],
@@ -4038,7 +4027,7 @@ https://www.google.com {}""",
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test'))[0]
     self.assertEqual(
       '-4 -a ${section:option} afternewline ipv4',
@@ -4080,7 +4069,7 @@ https://www.google.com {}""",
     # call the monitor for this partition
     monitor_file = glob.glob(
       os.path.join(
-        self.instance_path, '*', 'etc', 'monitor-promise',
+        self.instance_path, '*', 'etc', 'promise',
         'check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test'))[0]
     self.assertEqual(
       '-a ${section:option} afternewline ipv6',

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_monitor_promise_list-CADDY.txt

-TestDefaultMonitorHttpdPort-1/etc/monitor-promise/check-_test-error-log-last-day
-TestDefaultMonitorHttpdPort-1/etc/monitor-promise/check-_test-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv4_https
 TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_http
 TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_https
 TestDefaultMonitorHttpdPort-1/etc/promise/caddy_ssl_cached
+TestDefaultMonitorHttpdPort-1/etc/promise/check-_test-error-log-last-day
+TestDefaultMonitorHttpdPort-1/etc/promise/check-_test-error-log-last-hour
 TestDefaultMonitorHttpdPort-1/etc/promise/frontend-caddy-configuration-promise
 TestDefaultMonitorHttpdPort-1/etc/promise/monitor-http-frontend
 TestDefaultMonitorHttpdPort-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_monitor_promise_list-CADDY.txt

-TestDuplicateSiteKeyProtection-1/etc/monitor-promise/check-_site_2-error-log-last-day
-TestDuplicateSiteKeyProtection-1/etc/monitor-promise/check-_site_2-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv4_https
 TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv6_http
 TestDuplicateSiteKeyProtection-1/etc/promise/caddy_frontend_ipv6_https
 TestDuplicateSiteKeyProtection-1/etc/promise/caddy_ssl_cached
+TestDuplicateSiteKeyProtection-1/etc/promise/check-_site_2-error-log-last-day
+TestDuplicateSiteKeyProtection-1/etc/promise/check-_site_2-error-log-last-hour
 TestDuplicateSiteKeyProtection-1/etc/promise/frontend-caddy-configuration-promise
 TestDuplicateSiteKeyProtection-1/etc/promise/monitor-http-frontend
 TestDuplicateSiteKeyProtection-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_monitor_promise_list-CADDY.txt

-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,12 @@ TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/caddy_ssl_cached
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-true-error-log-last-day
+TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-_enable-http2-true-error-log-last-hour
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-http-frontend
 TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_monitor_promise_list-CADDY.txt

-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,12 @@ TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/caddy_ssl_cached
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-true-error-log-last-day
+TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-_enable-http2-true-error-log-last-hour
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-http-frontend
 TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_monitor_promise_list-CADDY.txt

-TestMalformedBackenUrlSlave-1/etc/monitor-promise/check-_empty-error-log-last-day
-TestMalformedBackenUrlSlave-1/etc/monitor-promise/check-_empty-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestMalformedBackenUrlSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestMalformedBackenUrlSlave-1/etc/promise/caddy_ssl_cached
+TestMalformedBackenUrlSlave-1/etc/promise/check-_empty-error-log-last-day
+TestMalformedBackenUrlSlave-1/etc/promise/check-_empty-error-log-last-hour
 TestMalformedBackenUrlSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestMalformedBackenUrlSlave-1/etc/promise/monitor-http-frontend
 TestMalformedBackenUrlSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_monitor_promise_list-CADDY.txt

-TestQuicEnabled-1/etc/monitor-promise/check-_url-error-log-last-day
-TestQuicEnabled-1/etc/monitor-promise/check-_url-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestQuicEnabled-1/etc/promise/caddy_frontend_ipv4_https
 TestQuicEnabled-1/etc/promise/caddy_frontend_ipv6_http
 TestQuicEnabled-1/etc/promise/caddy_frontend_ipv6_https
 TestQuicEnabled-1/etc/promise/caddy_ssl_cached
+TestQuicEnabled-1/etc/promise/check-_url-error-log-last-day
+TestQuicEnabled-1/etc/promise/check-_url-error-log-last-hour
 TestQuicEnabled-1/etc/promise/frontend-caddy-configuration-promise
 TestQuicEnabled-1/etc/promise/monitor-http-frontend
 TestQuicEnabled-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_monitor_promise_list-CADDY.txt

-TestRe6stVerificationUrlDefaultSlave-1/etc/monitor-promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlDefaultSlave-1/etc/monitor-promise/check-_default-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/caddy_ssl_cached
+TestRe6stVerificationUrlDefaultSlave-1/etc/promise/check-_default-error-log-last-day
+TestRe6stVerificationUrlDefaultSlave-1/etc/promise/check-_default-error-log-last-hour
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-http-frontend
 TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_monitor_promise_list-CADDY.txt

-TestRe6stVerificationUrlSlave-1/etc/monitor-promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlSlave-1/etc/monitor-promise/check-_default-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestRe6stVerificationUrlSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestRe6stVerificationUrlSlave-1/etc/promise/caddy_ssl_cached
+TestRe6stVerificationUrlSlave-1/etc/promise/check-_default-error-log-last-day
+TestRe6stVerificationUrlSlave-1/etc/promise/check-_default-error-log-last-hour
 TestRe6stVerificationUrlSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestRe6stVerificationUrlSlave-1/etc/promise/monitor-http-frontend
 TestRe6stVerificationUrlSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_monitor_promise_list-CADDY.txt

-TestReplicateSlave-1/etc/monitor-promise/check-_replicate-error-log-last-day
-TestReplicateSlave-1/etc/monitor-promise/check-_replicate-error-log-last-hour
-TestReplicateSlave-2/etc/monitor-promise/check-_replicate-error-log-last-day
-TestReplicateSlave-2/etc/monitor-promise/check-_replicate-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,8 @@ TestReplicateSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestReplicateSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestReplicateSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestReplicateSlave-1/etc/promise/caddy_ssl_cached
+TestReplicateSlave-1/etc/promise/check-_replicate-error-log-last-day
+TestReplicateSlave-1/etc/promise/check-_replicate-error-log-last-hour
 TestReplicateSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestReplicateSlave-1/etc/promise/monitor-http-frontend
 TestReplicateSlave-1/etc/promise/monitor-httpd-listening-on-tcp
@@ -28,6 +30,8 @@ TestReplicateSlave-2/etc/promise/caddy_frontend_ipv4_https
 TestReplicateSlave-2/etc/promise/caddy_frontend_ipv6_http
 TestReplicateSlave-2/etc/promise/caddy_frontend_ipv6_https
 TestReplicateSlave-2/etc/promise/caddy_ssl_cached
+TestReplicateSlave-2/etc/promise/check-_replicate-error-log-last-day
+TestReplicateSlave-2/etc/promise/check-_replicate-error-log-last-hour
 TestReplicateSlave-2/etc/promise/frontend-caddy-configuration-promise
 TestReplicateSlave-2/etc/promise/monitor-http-frontend
 TestReplicateSlave-2/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestSlave.test_monitor_promise_list-CADDY.txt

-TestSlave-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_empty-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_empty-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_https-only-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_https-only-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-TestSlave-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
-TestSlave-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_server-alias-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_server-alias-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-eventsource-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-notebook-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-notebook-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-redirect-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-redirect-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-path-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_url-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_url-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_url_https-url-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_url_https-url-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-CADDY.txt

@@ -8,6 +8,97 @@ TestSlave-1/etc/promise/caddy_frontend_ipv4_https
 TestSlave-1/etc/promise/caddy_frontend_ipv6_http
 TestSlave-1/etc/promise/caddy_frontend_ipv6_https
 TestSlave-1/etc/promise/caddy_ssl_cached
+TestSlave-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-day
+TestSlave-1/etc/promise/check-_apache_custom_http_s-accepted-error-log-last-hour
+TestSlave-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-day
+TestSlave-1/etc/promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
+TestSlave-1/etc/promise/check-_custom_domain-error-log-last-day
+TestSlave-1/etc/promise/check-_custom_domain-error-log-last-hour
+TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
+TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
+TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
+TestSlave-1/etc/promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
+TestSlave-1/etc/promise/check-_custom_domain_wildcard-error-log-last-day
+TestSlave-1/etc/promise/check-_custom_domain_wildcard-error-log-last-hour
+TestSlave-1/etc/promise/check-_disabled-cookie-list-error-log-last-day
+TestSlave-1/etc/promise/check-_disabled-cookie-list-error-log-last-hour
+TestSlave-1/etc/promise/check-_empty-error-log-last-day
+TestSlave-1/etc/promise/check-_empty-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable-http2-default-error-log-last-day
+TestSlave-1/etc/promise/check-_enable-http2-default-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable-http2-false-error-log-last-day
+TestSlave-1/etc/promise/check-_enable-http2-false-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-disable-via-header-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_https-only-error-log-last-day
+TestSlave-1/etc/promise/check-_https-only-error-log-last-hour
+TestSlave-1/etc/promise/check-_monitor-ipv4-test-error-log-last-day
+TestSlave-1/etc/promise/check-_monitor-ipv4-test-error-log-last-hour
+TestSlave-1/etc/promise/check-_monitor-ipv4-test-ipv4-packet-list-test
+TestSlave-1/etc/promise/check-_monitor-ipv6-test-error-log-last-day
+TestSlave-1/etc/promise/check-_monitor-ipv6-test-error-log-last-hour
+TestSlave-1/etc/promise/check-_monitor-ipv6-test-ipv6-packet-list-test
+TestSlave-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
+TestSlave-1/etc/promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
+TestSlave-1/etc/promise/check-_re6st-optimal-test-error-log-last-day
+TestSlave-1/etc/promise/check-_re6st-optimal-test-error-log-last-hour
+TestSlave-1/etc/promise/check-_re6st-optimal-test-re6st-optimal-test
+TestSlave-1/etc/promise/check-_server-alias-duplicated-error-log-last-day
+TestSlave-1/etc/promise/check-_server-alias-duplicated-error-log-last-hour
+TestSlave-1/etc/promise/check-_server-alias-error-log-last-day
+TestSlave-1/etc/promise/check-_server-alias-error-log-last-hour
+TestSlave-1/etc/promise/check-_server-alias-wildcard-error-log-last-day
+TestSlave-1/etc/promise/check-_server-alias-wildcard-error-log-last-hour
+TestSlave-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
+TestSlave-1/etc/promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
+TestSlave-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
+TestSlave-1/etc/promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
+TestSlave-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-day
+TestSlave-1/etc/promise/check-_ssl_ca_crt_garbage-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-eventsource-error-log-last-day
+TestSlave-1/etc/promise/check-_type-eventsource-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-notebook-error-log-last-day
+TestSlave-1/etc/promise/check-_type-notebook-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-redirect-error-log-last-day
+TestSlave-1/etc/promise/check-_type-redirect-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-default-path-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-default-path-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-path-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-path-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
+TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
+TestSlave-1/etc/promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
+TestSlave-1/etc/promise/check-_url-error-log-last-day
+TestSlave-1/etc/promise/check-_url-error-log-last-hour
+TestSlave-1/etc/promise/check-_url_https-url-error-log-last-day
+TestSlave-1/etc/promise/check-_url_https-url-error-log-last-hour
 TestSlave-1/etc/promise/frontend-caddy-configuration-promise
 TestSlave-1/etc/promise/monitor-http-frontend
 TestSlave-1/etc/promise/monitor-httpd-listening-on-tcp

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_monitor_promise_list-CADDY.txt

-TestSlaveBadParameters-1/etc/monitor-promise/check-_default-path-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_default-path-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test
-TestSlaveBadParameters-1/etc/monitor-promise/check-_re6st-optimal-test-nocomma-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_re6st-optimal-test-nocomma-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_re6st-optimal-test-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_re6st-optimal-test-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_re6st-optimal-test-unsafe-re6st-optimal-test
-TestSlaveBadParameters-1/etc/monitor-promise/check-_server-alias-same-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_server-alias-same-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_virtualhostroot-http-port-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_virtualhostroot-http-port-unsafe-error-log-last-hour
-TestSlaveBadParameters-1/etc/monitor-promise/check-_virtualhostroot-https-port-unsafe-error-log-last-day
-TestSlaveBadParameters-1/etc/monitor-promise/check-_virtualhostroot-https-port-unsafe-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_list-CADDY.txt

@@ -8,6 +8,25 @@ TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv4_https
 TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv6_http
 TestSlaveBadParameters-1/etc/promise/caddy_frontend_ipv6_https
 TestSlaveBadParameters-1/etc/promise/caddy_ssl_cached
+TestSlaveBadParameters-1/etc/promise/check-_default-path-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_default-path-unsafe-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test
+TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-nocomma-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-nocomma-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_re6st-optimal-test-unsafe-re6st-optimal-test
+TestSlaveBadParameters-1/etc/promise/check-_server-alias-same-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_server-alias-same-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-http-port-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-http-port-unsafe-error-log-last-hour
+TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-https-port-unsafe-error-log-last-day
+TestSlaveBadParameters-1/etc/promise/check-_virtualhostroot-https-port-unsafe-error-log-last-hour
 TestSlaveBadParameters-1/etc/promise/frontend-caddy-configuration-promise
 TestSlaveBadParameters-1/etc/promise/monitor-http-frontend
 TestSlaveBadParameters-1/etc/promise/monitor-httpd-listening-on-tcp

software/monitor/instance-monitor.cfg.jinja2

@@ -87,7 +87,7 @@ update-command = ${:command}
 recipe = slapos.cookbook:wrapper
 command-line = 
   ${monitor-directory:bin}/python {{ monitor_collect_csv_dump }} --output_folder ${monitor-directory:consumption}
-wrapper-path = ${monitor-directory:reports}/monitor-collect-csv-dump  
+wrapper-path = ${monitor-directory:bin}/monitor-collect-csv-dump  
 
 [monitor-check-memory-usage]
 recipe = slapos.cookbook:wrapper

software/monitor/software.cfg

@@ -28,7 +28,7 @@ mode = 0644
 recipe = slapos.recipe.build:download 
 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
 destination = ${buildout:directory}/template-base-monitor.cfg
-md5sum = ef3297619e1fc2a5a8d1b0546c1a0db2
+md5sum = 2d9436dd6b116ee2e7cc7b30a6305475
 mode = 0644
 
 [template-monitor-distributor]

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = d9096d49eda70f3aa02c44615077f6c9
+md5sum = a897ae4e90696516c4a6f831999f2c34
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -30,7 +30,7 @@ md5sum = 1ed9526a6e5ac9a80e5b3add2d0a88fe
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 8132130c89896c2d30a08f3b3a7000ff
+md5sum = 7f87e6d220934eb13ab2b5d67dca8922
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2

software/slaprunner/instance-runner-export.cfg.in

@@ -123,7 +123,7 @@ configuration-file-path = ${buildout:directory}/knowledge0.cfg
 [monitor-check-resilient-feed-file]
 recipe = slapos.recipe.template:jinja2
 template = {{ monitor_check_resilient_feed_template_path }}
-rendered = ${monitor-directory:reports}/check-create-resilient-feed-files
+rendered = ${monitor-directory:bin}/check-create-resilient-feed-files
 mode = 700
 context =
   key input_feed_directory directory:notifier-feeds

software/slaprunner/instance-runner.cfg

@@ -884,7 +884,7 @@ configuration-file-path = $${buildout:directory}/knowledge0.cfg
 [monitor-check-webrunner-internal-instance]
 recipe = slapos.recipe.template:jinja2
 template = ${monitor-check-webrunner-internal-instance:location}/${monitor-check-webrunner-internal-instance:filename}
-rendered = $${monitor-directory:reports}/$${:filename}
+rendered = $${monitor-directory:bin}/$${:filename}
 filename = monitor-check-webrunner-internal-instance
 mode = 0744
 

stack/monitor/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = a8ae4a8685fd6d7263bf6f6db02fbdc5
+md5sum = 0713a3987d11dc60649d8105ec9746f4

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -28,8 +28,6 @@ monitor = ${:srv}/monitor
 recipe = slapos.cookbook:mkdirectory
 bin = ${directory:bin}
 etc = ${directory:etc}
-promises = ${directory:etc}/monitor-promise
-reports = ${directory:etc}/monitor-report
 pids = ${directory:run}/monitor
 webdav = ${directory:monitor}/webdav
 public = ${directory:monitor}/public

stack/resilient/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 98d7e7c60e090dd3a460ca0410a194ec
+md5sum = 4cff5dc82428256929ecbf21cd918c00
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -330,7 +330,7 @@ private-path-list +=
 [monitor-check-resilient-feed-file]
 recipe = slapos.recipe.template:jinja2
 template = ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
-rendered = $${monitor-directory:reports}/check-create-resilient-feed-files
+rendered = $${monitor-directory:bin}/check-create-resilient-feed-files
 mode = 700
 context =
   key input_feed_directory directory:notifier-feeds