Update release candidate

component/nginx/buildout.cfg

@@ -98,7 +98,7 @@ configure-options=
   --with-http_v2_module
   --with-http_gzip_static_module
   --with-ld-opt="-L ${zlib:location}/lib -L ${openssl-1.0:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl-1.0:location}/include -I ${zlib:location}/include"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl-1.0:location}/include -I ${zlib:location}/include -Wno-error"
   --add-module=${nginx-push-stream-module:location}
 
 [nginx-push-stream-output]

component/perl-URI/buildout.cfg

@@ -7,5 +7,5 @@ parts =
 [perl-URI]
 <= perl-CPAN-package
 module = URI/URI
-version = 1.72
-md5sum = cd56d81ed429efaa97e7f3ff08851b48
+version = 1.76
+md5sum = c236e0142adecc1b1104da664bc43a79

slapos/recipe/certificate_authority/template/openssl.cnf.ca.in

@@ -43,7 +43,7 @@ dir		= %(working_directory)s		# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
-#unique_subject	= no			# Set to 'no' to allow creation of
+unique_subject	= no			# Set to 'no' to allow creation of
 					# several ctificates with same subject.
 new_certs_dir	= $dir/newcerts		# default place for new certs.
 

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = d2dda14597c061960f0b9d38ec0d8313
+md5sum = 72e8ff0773fd0325dcbe994786156570
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = ef06c04a5aa33b103dc1d25d0dfe8217
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = a473ded24aed999abed3d79a08bb09a6
+md5sum = d2e0132dded2f65e3590c72a154f6dd6
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -58,7 +58,7 @@ md5sum = 0c5ef7f26a142c3ab53e835d2caa698d
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
-md5sum = 907372828d1ceb05c41240078196f439
+md5sum = 6ca9a3251830d602cf25e0a0389fc74b
 
 [template-log-access]
 filename = templates/template-log-access.conf.in
@@ -74,7 +74,7 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 
 [template-trafficserver-records-config]
 filename = templates/trafficserver/records.config.jinja2
-md5sum = 15cbdba7ab7fe3c3d7c26c1718e47bbd
+md5sum = 5ef0ebc37437ada7cc176e663da5f36c
 
 [template-trafficserver-storage-config]
 filename = templates/trafficserver/storage.config.jinja2

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

@@ -244,6 +244,7 @@ extra-context =
     key autocert caddy-directory:autocert
     key master_certificate caddy-configuration:master-certificate
     key caddy_log_directory caddy-directory:slave-log
+    key caddy_log_cache_direct_directory caddy-directory:slave-log-cache-direct
     key local_ipv4 :local_ipv4
     key local_ipv6 :local_ipv6
     key global_ipv6 slap-network-information:global-ipv6
@@ -361,6 +362,7 @@ slave-with-cache-configuration = ${directory:etc}/caddy-slave-with-cache-conf.d/
 cache = ${directory:var}/cache
 mod-ssl = ${:cache}/httpd_mod_ssl
 slave-log = ${directory:log}/httpd
+slave-log-cache-direct = ${directory:log}/httpd-cache-direct
 autocert = ${directory:srv}/autocert
 master-autocert-dir = ${:autocert}/master-autocert
 custom-ssl-directory = ${:slave-configuration}/ssl

software/caddy-frontend/instance-caddy-input-schema.json

@@ -11,6 +11,18 @@
       "title": "Frontend Replication Quantity",
       "type": "integer"
     },
+    "apache-certificate": {
+      "description": "SSL Certificate used by the server. Deprecated, please use master-key-upload-url.",
+      "textarea": true,
+      "title": "[DEPRECATED] SSL Certificate",
+      "type": "string"
+    },
+    "apache-key": {
+      "description": "SSL Key used by the server. Deprecated, please use master-key-upload-url.",
+      "textarea": true,
+      "title": "[DEPRECATED] SSL Key",
+      "type": "string"
+    },
     "domain": {
       "description": "Base Domain for create subdomains (ie.: example.com).",
       "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$",

software/caddy-frontend/instance-slave-caddy-input-schema.json

@@ -155,6 +155,20 @@
       "title": "Verify Backend Certificates",
       "type": "string"
     },
+    "ssl_crt": {
+      "default": "",
+      "description": "Content of the SSL Certificate file. Deprecated, please use key-upload-url.",
+      "textarea": true,
+      "title": "[DEPRECATED] SSL Certificate",
+      "type": "string"
+    },
+    "ssl_key": {
+      "default": "",
+      "description": "Content of the SSL Key file. Deprecated, please use key-upload-url.",
+      "textarea": true,
+      "title": "[DEPRECATED] SSL Key",
+      "type": "string"
+    },
     "ssl_proxy_ca_crt": {
       "default": "",
       "description": "Content of the SSL Certificate Authority file of the backend (to be used with ssl-proxy-verify)",

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -50,8 +50,13 @@ content =
   from slapos.promise.plugin.${:module} import RunPromise
 output = {{ plugin_directory }}/${:name}
 
+# empty section if no cached slaves are available
+[slave-log-cache-direct-directory-dict]
+
 {# Loop thought slave list to set up slaves #}
 {% for slave_instance in slave_instance_list %}
+{%   set slave_type = slave_instance.get('type', '') %}
+{%   set enable_cache = (('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES and slave_type != 'redirect') %}
 {%   set slave_reference = slave_instance.get('slave_reference') %}
 {%   set slave_kedifa = slave_kedifa_information.get(slave_reference) %}
 {%   if slave_kedifa %}
@@ -59,7 +64,6 @@ output = {{ plugin_directory }}/${:name}
 {%   else %}
 {%     set key_download_url = 'notreadyyet' %}
 {%   endif %}
-{%   set slave_type = slave_instance.get('type', '') %}
 {%   set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
 {%   set slave_parameter_dict = generic_instance_parameter_dict.copy() %}
 {%   set slave_publish_dict = {} %}
@@ -73,6 +77,9 @@ output = {{ plugin_directory }}/${:name}
 {%   do part_list.extend([slave_logrotate_section, slave_section_title]) %}
 
 {%   set slave_log_folder = '${logrotate-directory:logrotate-backup}/' + slave_reference + "-logs" %}
+{%   if enable_cache %}
+{%     set slave_log_cache_direct_folder = '${logrotate-directory:logrotate-backup}/' + slave_reference + "-cache-direct-logs" %}
+{%   endif %}
 
 {#   Pass HTTP2 switch #}
 {%   do slave_instance.__setitem__('enable_http2_by_default', enable_http2_by_default) %}
@@ -87,6 +94,12 @@ output = {{ plugin_directory }}/${:name}
 {%   do slave_parameter_dict.__setitem__('error_log', '/'.join([caddy_log_directory, '%s_error_log' % slave_reference])) %}
 {%   do slave_instance.__setitem__('access_log', slave_parameter_dict.get('access_log')) %}
 {%   do slave_instance.__setitem__('error_log', slave_parameter_dict.get('error_log')) %}
+{%   if enable_cache %}
+{%     do slave_parameter_dict.__setitem__('access_log_cache_direct', '/'.join([caddy_log_cache_direct_directory, '%s_access_log' % slave_reference])) %}
+{%     do slave_parameter_dict.__setitem__('error_log_cache_direct', '/'.join([caddy_log_cache_direct_directory, '%s_error_log' % slave_reference])) %}
+{%     do slave_instance.__setitem__('access_log_cache_direct', slave_parameter_dict.get('access_log_cache_direct')) %}
+{%     do slave_instance.__setitem__('error_log_cache_direct', slave_parameter_dict.get('error_log_cache_direct')) %}
+{%   endif %}
 
 {#   Add slave log directory to the slave log access dict #}
 {%   do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %}
@@ -102,7 +115,6 @@ output = {{ plugin_directory }}/${:name}
 {%     do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, slapparameter_dict.get('domain'))) %}
 {%   endif %}
 
-{%   set enable_cache = (('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES and slave_type != 'redirect') %}
 {%   if enable_cache and 'url' in slave_instance %}
 {%     if 'domain' in slave_instance %}
 {%       do slave_instance.__setitem__('custom_domain', slave_instance.get('domain')) %}
@@ -125,22 +137,10 @@ output = {{ plugin_directory }}/${:name}
 [slave-log-directory-dict]
 {{slave_reference}} = {{ slave_log_folder }}
 
-[slave-log-directories]
-<= slave-log-directory-dict
-recipe = slapos.cookbook:mkdirectory
-
-{% do part_list.append('slave-log-directories') %}
-
-[caddy-log-access]
-< = jinja2-template-base
-template = {{frontend_configuration.get('template-log-access')}}
-rendered = {{frontend_configuration.get('log-access-configuration')}}
-extra-context =
-    section slave_log_directory slave-log-directory-dict
-    section slave_password slave-password
-    section parameter_dict caddy-log-access-parameters
-
-{% do part_list.append('caddy-log-access') %}
+{%   if enable_cache %}
+[slave-log-cache-direct-directory-dict]
+{{slave_reference}}_cache_direct = {{ slave_log_cache_direct_folder }}
+{%   endif %}
 
 [slave-password]
 {{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }}
@@ -151,6 +151,13 @@ extra-context =
 name = ${:_buildout_section_name_}
 log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
 backup = {{ slave_log_folder }} 
+{%    if enable_cache %}
+[{{slave_logrotate_section}}_cache_direct]
+<= logrotate-entry-base
+name = ${:_buildout_section_name_}
+log = {{slave_parameter_dict.get('access_log_cache_direct')}} {{slave_parameter_dict.get('error_log_cache_direct')}}
+backup = {{ slave_log_cache_direct_folder }}
+{%    endif %}
 
 {# integrate current logs inside #}
 [{{slave_ln_section}}]
@@ -263,28 +270,6 @@ filename = {{ '%s.conf' % slave_reference }}
 {{ '\n' }}
 
 
-{%   set check_error_log_section_title = 'check-%s-error-log-last-hour' % slave_instance.get('slave_reference') %}
-{%   do part_list.append(check_error_log_section_title) %}
-[{{ check_error_log_section_title }}]
-<= promise-plugin-base
-module = check_error_on_http_log
-name = {{ check_error_log_section_title }}.py
-config-log-file = {{ slave_instance.get('error_log') }}
-config-maximum-delay = 3600
-# promise frequency in minutes (2 times/day)
-config-frequency = 720
-
-{%   set check_error_log_section_title = 'check-%s-error-log-last-day' % slave_instance.get('slave_reference') %}
-{%   do part_list.append(check_error_log_section_title) %}
-[{{ check_error_log_section_title }}]
-<= promise-plugin-base
-module = check_error_on_http_log
-name = {{ check_error_log_section_title }}.py
-config-log-file = {{ slave_instance.get('error_log') }}
-config-maximum-delay = 86400
-# promise frequency in minutes (2 times/day)
-config-frequency = 720
-
 {%   set monitor_ipv6_test = slave_instance.get('monitor-ipv6-test', '') %}
 {%   if monitor_ipv6_test %}
 {%     set monitor_ipv6_section_title = 'check-%s-ipv6-packet-list-test' % slave_instance.get('slave_reference') %}
@@ -350,6 +335,29 @@ recipe = slapos.cookbook:publish
 {# End of the main for loop#}
 {% endfor %}
 
+[slave-log-directories]
+<= slave-log-directory-dict
+recipe = slapos.cookbook:mkdirectory
+
+{% do part_list.append('slave-log-directories') %}
+
+[slave-log-cache-direct-directories]
+<= slave-log-cache-direct-directory-dict
+recipe = slapos.cookbook:mkdirectory
+
+{% do part_list.append('slave-log-cache-direct-directories') %}
+
+[caddy-log-access]
+< = jinja2-template-base
+template = {{frontend_configuration.get('template-log-access')}}
+rendered = {{frontend_configuration.get('log-access-configuration')}}
+extra-context =
+    section slave_log_directory slave-log-directory-dict
+    section slave_password slave-password
+    section parameter_dict caddy-log-access-parameters
+
+{% do part_list.append('caddy-log-access') %}
+
 ###############################################
 ### Prepare virtualhost for slaves using cache
 

software/caddy-frontend/templates/cached-virtualhost.conf.in

@@ -36,6 +36,13 @@
     insecure_skip_verify
 {%- endif %}
   }
+  log / {{ slave_parameter.get('access_log_cache_direct') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
+    rotate_size 0
+  }
+
+  errors {{ slave_parameter.get('error_log_cache_direct') }} {
+    rotate_size 0
+  }
 }
 
 # SSL-enabled backends
@@ -58,4 +65,11 @@
     insecure_skip_verify
 {%- endif %}
   }
+  log / {{ slave_parameter.get('access_log_cache_direct') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
+    rotate_size 0
+  }
+
+  errors {{ slave_parameter.get('error_log_cache_direct') }} {
+    rotate_size 0
+  }
 }

software/caddy-frontend/templates/trafficserver/records.config.jinja2

@@ -119,7 +119,7 @@ CONFIG proxy.config.http.cache.http INT 1
 #    https://docs.trafficserver.apache.org/en/latest/admin-guide/files/cache.config.en.html
 ##############################################################################
 CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 1
-CONFIG proxy.config.http.normalize_ae_gzip INT 1
+CONFIG proxy.config.http.normalize_ae_gzip INT 0
 CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 1
 CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 1
     # https://docs.trafficserver.apache.org/records.config#proxy-config-http-cache-when-to-revalidate

software/caddy-frontend/test/test.py

@@ -736,6 +736,14 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
 
   @classmethod
   def untilSlavePartitionReady(cls):
+    # all on-watch services shall not be exited
+    for process in cls.getSupervisorRPCServer()\
+      .supervisor.getAllProcessInfo():
+      if process['name'].endswith('-on-watch') and \
+        process['statename'] == 'EXITED':
+        if process['name'].startswith('monitor-http'):
+          continue
+        return False
     for slave_reference, partition_parameter_kw in cls\
             .getSlaveParameterDictDict().items():
       parameter_dict = cls.slapos_controler.slap.registerOpenOrder().request(
@@ -768,10 +776,6 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
     # run partition for slaves to be setup
     cls.runComputerPartitionUntil(
       cls.untilSlavePartitionReady)
-    # run once more slapos node instance, as kedifa-updater sets up
-    # certificates needed for caddy-frontend, and on this moment it can be
-    # not started yet
-    cls.runComputerPartition(max_quantity=1)
     for slave_reference, partition_parameter_kw in cls\
             .getSlaveParameterDictDict().items():
       slave_instance = request(

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

-T-2/etc/monitor-promise/check-_test-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-_test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_site_2-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_site_1-error-log-last-day.py: OK
-T-2/etc/plugin/check-_site_1-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,12 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-T-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.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -15,12 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,12 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-T-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.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -15,12 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_empty-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_empty-error-log-last-day.py: OK
-T-2/etc/plugin/check-_empty-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d-CADDY.txt

@@ -5,9 +5,4 @@ T-0/etc/cron.d/monitor_collect
 T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
+T-1/etc/cron.d/monitor_collect
\ No newline at end of file
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-2/var/log/frontend-access.log
+T-1/var/log/expose-csr_id.log
\ No newline at end of file
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
-T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
+T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt

@@ -7,18 +7,4 @@ T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-1/etc/plugin/kedifa-ip-port-listening.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt

@@ -13,20 +13,4 @@ T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
 T-1:monitor-httpd-{hash-generic}-on-watch EXITED
 T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch EXITED
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d-CADDY.txt

@@ -5,9 +5,4 @@ T-0/etc/cron.d/monitor_collect
 T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
+T-1/etc/cron.d/monitor_collect
\ No newline at end of file
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-2/var/log/frontend-access.log
+T-1/var/log/expose-csr_id.log
\ No newline at end of file
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
-T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
+T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt

@@ -7,18 +7,4 @@ T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-1/etc/plugin/kedifa-ip-port-listening.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt

@@ -13,20 +13,4 @@ T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
 T-1:monitor-httpd-{hash-generic}-on-watch EXITED
 T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch EXITED
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file

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

-T-2/etc/monitor-promise/check-_url-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_url-error-log-last-day.py: OK
-T-2/etc/plugin/check-_url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_default-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_default-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_default-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_default-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_replicate-error-log-last-day
-T-2/etc/monitor-promise/check-_replicate-error-log-last-hour
-T-3/etc/monitor-promise/check-_replicate-error-log-last-day
-T-3/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_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_replicate-error-log-last-day.py: OK
-T-2/etc/plugin/check-_replicate-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
@@ -31,8 +29,6 @@ T-3/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-3/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-3/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-3/etc/plugin/caddy_ssl_cached.py: OK
-T-3/etc/plugin/check-_replicate-error-log-last-day.py: OK
-T-3/etc/plugin/check-_replicate-error-log-last-hour.py: OK
 T-3/etc/plugin/check-free-disk-space.py: OK
 T-3/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-3/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

@@ -3,6 +3,18 @@ T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_Url_access_log
 T-2/var/log/httpd/_Url_error_log

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

-T-2/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
-T-2/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-T-2/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-T-2/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-T-2/etc/monitor-promise/check-_custom_domain-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain-error-log-last-hour
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-T-2/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-hour
-T-2/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
-T-2/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
-T-2/etc/monitor-promise/check-_empty-error-log-last-day
-T-2/etc/monitor-promise/check-_empty-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-2/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_https-only-error-log-last-day
-T-2/etc/monitor-promise/check-_https-only-error-log-last-hour
-T-2/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
-T-2/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
 T-2/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
 T-2/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-T-2/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-T-2/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-T-2/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
-T-2/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
 T-2/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
-T-2/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-day
-T-2/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-hour
-T-2/etc/monitor-promise/check-_server-alias-error-log-last-day
-T-2/etc/monitor-promise/check-_server-alias-error-log-last-hour
-T-2/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-day
-T-2/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-hour
-T-2/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-T-2/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_ca_crt_only-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_ca_crt_only-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-eventsource-error-log-last-day
-T-2/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-notebook-error-log-last-day
-T-2/etc/monitor-promise/check-_type-notebook-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-redirect-error-log-last-day
-T-2/etc/monitor-promise/check-_type-redirect-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-path-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-T-2/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-T-2/etc/monitor-promise/check-_url-error-log-last-day
-T-2/etc/monitor-promise/check-_url-error-log-last-hour
-T-2/etc/monitor-promise/check-_url_https-url-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,105 +15,9 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-_Url-error-log-last-day.py: OK
-T-2/etc/plugin/check-_Url-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
-T-2/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
-T-2/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
-T-2/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_empty-error-log-last-day.py: OK
-T-2/etc/plugin/check-_empty-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_https-only-error-log-last-day.py: OK
-T-2/etc/plugin/check-_https-only-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-T-2/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_only-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_only-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-websocket-transparent-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-websocket-transparent-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-transparent-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-transparent-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
-T-2/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_default-path-unsafe-error-log-last-day
-T-2/etc/monitor-promise/check-_default-path-unsafe-error-log-last-hour
-T-2/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-error-log-last-day
-T-2/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-error-log-last-hour
 T-2/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-error-log-last-day
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-error-log-last-hour
 T-2/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test
-T-2/etc/monitor-promise/check-_re6st-optimal-test-nocomma-error-log-last-day
-T-2/etc/monitor-promise/check-_re6st-optimal-test-nocomma-error-log-last-hour
-T-2/etc/monitor-promise/check-_re6st-optimal-test-unsafe-error-log-last-day
-T-2/etc/monitor-promise/check-_re6st-optimal-test-unsafe-error-log-last-hour
 T-2/etc/monitor-promise/check-_re6st-optimal-test-unsafe-re6st-optimal-test
-T-2/etc/monitor-promise/check-_server-alias-same-error-log-last-day
-T-2/etc/monitor-promise/check-_server-alias-same-error-log-last-hour
-T-2/etc/monitor-promise/check-_virtualhostroot-http-port-unsafe-error-log-last-day
-T-2/etc/monitor-promise/check-_virtualhostroot-http-port-unsafe-error-log-last-hour
-T-2/etc/monitor-promise/check-_virtualhostroot-https-port-unsafe-error-log-last-day
-T-2/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_run_plugin-CADDY.txt

@@ -15,25 +15,9 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_default-path-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_default-path-unsafe-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-unsafe-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-day.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-nocomma-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_re6st-optimal-test-unsafe-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-_server-alias-same-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-same-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-day.py: OK
-T-2/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -3,6 +3,18 @@ T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
+T-2/var/log/httpd-cache-direct/_enable_cache_access_log
+T-2/var/log/httpd-cache-direct/_enable_cache_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_Url_access_log
 T-2/var/log/httpd/_Url_error_log

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

-T-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
-T-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-T-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-T-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-T-1/etc/monitor-promise/check-_custom_domain-error-log-last-day
-T-1/etc/monitor-promise/check-_custom_domain-error-log-last-hour
-T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-T-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-T-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-day
-T-1/etc/monitor-promise/check-_custom_domain_wildcard-error-log-last-hour
-T-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
-T-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
-T-1/etc/monitor-promise/check-_empty-error-log-last-day
-T-1/etc/monitor-promise/check-_empty-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-T-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_https-only-error-log-last-day
-T-1/etc/monitor-promise/check-_https-only-error-log-last-hour
-T-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
-T-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
 T-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-T-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
-T-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
 T-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-T-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-T-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-T-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
-T-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
 T-1/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
-T-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-day
-T-1/etc/monitor-promise/check-_server-alias-duplicated-error-log-last-hour
-T-1/etc/monitor-promise/check-_server-alias-error-log-last-day
-T-1/etc/monitor-promise/check-_server-alias-error-log-last-hour
-T-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-day
-T-1/etc/monitor-promise/check-_server-alias-wildcard-error-log-last-hour
-T-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-day
-T-1/etc/monitor-promise/check-_server-alias_custom_domain-duplicated-error-log-last-hour
-T-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-T-1/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-T-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
-T-1/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-eventsource-error-log-last-day
-T-1/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-notebook-error-log-last-day
-T-1/etc/monitor-promise/check-_type-notebook-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-redirect-error-log-last-day
-T-1/etc/monitor-promise/check-_type-redirect-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-path-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-T-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-T-1/etc/monitor-promise/check-_url-error-log-last-day
-T-1/etc/monitor-promise/check-_url-error-log-last-hour
-T-1/etc/monitor-promise/check-_url_https-url-error-log-last-day
-T-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.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -15,105 +15,9 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-_Url-error-log-last-day.py: OK
-T-2/etc/plugin/check-_Url-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-day.py: OK
-T-2/etc/plugin/check-_apache_custom_http_s-accepted-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-day.py: OK
-T-2/etc/plugin/check-_caddy_custom_http_s-accepted-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_wildcard-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_wildcard-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_disabled-cookie-list-error-log-last-day.py: OK
-T-2/etc/plugin/check-_disabled-cookie-list-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_empty-error-log-last-day.py: OK
-T-2/etc/plugin/check-_empty-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-default-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-no-cache-request-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-disable-via-header-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_https-only-error-log-last-day.py: OK
-T-2/etc/plugin/check-_https-only-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-T-2/etc/plugin/check-_prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-error-log-last-day.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-_server-alias-duplicated-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-duplicated-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias-wildcard-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias-wildcard-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-day.py: OK
-T-2/etc/plugin/check-_server-alias_custom_domain-duplicated-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_only-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_only-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-redirect-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-redirect-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-websocket-transparent-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-path-list-websocket-transparent-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-transparent-false-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-websocket-websocket-transparent-false-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-default-path-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-default-path-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-path-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-path-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-prefer-gzip-encoding-to-backend-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-http-port-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
-T-2/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day
-T-2/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_ca_crt_does_not_match-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_ca_crt_garbage-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_from_master-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_master-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_from_master_kedifa_overrides-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_master_kedifa_overrides-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_from_slave-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_slave-error-log-last-hour
-T-2/etc/monitor-promise/check-_ssl_from_slave_kedifa_overrides-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_slave_kedifa_overrides-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_master-error-log-last-day
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_master-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-day
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_slave-error-log-last-day
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_slave-error-log-last-hour
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-day
-T-2/etc/monitor-promise/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt

@@ -15,30 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
-T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_from_master-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_master-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_from_slave-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_slave-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_ssl_from_slave_kedifa_overrides-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_slave_kedifa_overrides-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_master-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_master-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_slave-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_slave-error-log-last-hour.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-day.py: OK
-T-2/etc/plugin/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

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

-T-2/etc/monitor-promise/check-_ssl_from_master-error-log-last-day
-T-2/etc/monitor-promise/check-_ssl_from_master-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt

@@ -15,8 +15,6 @@ T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_ssl_from_master-error-log-last-day.py: OK
-T-2/etc/plugin/check-_ssl_from_master-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK

software/caddy-frontend/test/utils.py

@@ -99,7 +99,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
     return "default"
 
   # Utility methods.
-  def getSupervisorRPCServer(self):
+  @classmethod
+  def getSupervisorRPCServer(cls):
     """Returns a XML-RPC connection to the supervisor used by slapos node
 
     Refer to http://supervisord.org/api.html for details of available methods.
@@ -112,7 +113,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
            None,
            # XXX hardcoded socket path
            serverurl="unix://{working_directory}/inst/supervisord.socket".format(
-             **self.config)))
+             **cls.config)))
 
   # Unittest methods
   @classmethod

software/wendelin/software.cfg

@@ -76,8 +76,8 @@ repository = https://lab.nexedi.com/nexedi/wendelin.git
 branch = master
 
 [versions]
-msgpack = 0.5.6
-msgpack-numpy = 0.4.4.2
+msgpack = 0.6.1
+msgpack-numpy = 0.4.4.3
 wendelin.core = 0.12
 
 

stack/slapos.cfg

@@ -138,7 +138,7 @@ slapos.cookbook = 1.0.92
 slapos.core = 1.4.23
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
-slapos.libnetworkcache = 0.16
+slapos.libnetworkcache = 0.17
 slapos.rebootstrap = 4.1
 slapos.recipe.build = 0.40
 slapos.recipe.cmmi = 0.10