monitor: Simplify edge configuration

Minimize amount of parameters passed from master partition to the slaves, as
slave configuration shall be maximally self contained.

Note: This will allow further development (like regionalization) much simpler.

software/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 9ddae686379e8d747410c1adf82b47d6
+md5sum = 25aacd9f1f8139fa1a31516eedc7a5eb
 
 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2
@@ -30,7 +30,7 @@ md5sum = a57106ee88ff3295b9ffce84105da79b
 
 [template-monitor-edgebot]
 _update_hash_filename_ = instance-monitor-edgebot.cfg.jinja2
-md5sum = 849608f74dc8c95aea04cadde0bea0e6
+md5sum = 92a064916843a92d6c756804cee70248
 
 [network-bench-cfg]
 filename = network_bench.cfg.in

software/monitor/instance-edgetest-input-schema.json

@@ -8,41 +8,11 @@
       "description": "List of name servers to use.",
       "type": "array"
     },
-    "check-status-code": {
-      "default": 200,
-      "title": "Default Check HTTP Code",
-      "description": "Default HTTP code to check against (default: 200).",
-      "type": "number"
-    },
-    "check-http-header-dict": {
-      "default": {},
-      "title": "HTTP header dict to check",
-      "description": "JSON object of expected HTTP header, like {\"Cache-Control\": \"max-age=3600, public\", \"Vary\": \"Accept-Encoding\"}. Note: Shall be expressed directly as object, without any additional qouting.",
-      "type": "object"
-    },
     "check-frontend-ip": {
       "default": [],
       "title": "Default list of Frontend IPs to check",
       "description": "Default list of Frontend IPs to check, if empty no constraint is used.",
       "type": "array"
-    },
-    "check-certificate-expiration-days": {
-      "default": 15,
-      "title": "Default certificate expiration days check",
-      "description": "Default amount of days to consider certificate as being to-be-expired (default: 15).",
-      "type": "number"
-    },
-    "check-maximum-elapsed-time": {
-      "default": 2,
-      "title": "Default maximum elapsed time for a site to reply (seconds)",
-      "description": "Default maximum elapsed time for a site to reply to be considered good (default: 2s).",
-      "type": "number"
-    },
-    "failure-amount": {
-      "default": 1,
-      "title": "Default amount of failures to consider URL as in bad state",
-      "description": "Default amount of failures to consider URL as in bad state, can be set to higher value for endpoints with accepted short outages (default: 1).",
-      "type": "number"
     }
   }
 }

software/monitor/instance-edgetest-slave-input-schema.json

@@ -4,44 +4,48 @@
   "properties": {
     "url": {
       "title": "URL to check",
-      "description": "URL to check, like https://example.com",
+      "description": "URL to check, like https://example.com/",
       "type": "string"
     },
     "check-status-code": {
-      "default": "Master default",
-      "title": "Default Check HTTP Code.",
-      "description": "HTTP code to check against (default: comes from master partition).",
-      "type": "number"
+      "title": "HTTP Code Check",
+      "description": "Expected response HTTP Code.",
+      "type": "number",
+      "default": 200,
+      "minimum": 100,
+      "maximum": 599
+    },
+    "check-certificate-expiration-days": {
+      "title": "Certificate Expiration Check (days)",
+      "description": "Amount of days to consider certificate as being to-be-expired.",
+      "type": "number",
+      "default": 15,
+      "minimum": 1
+    },
+    "check-maximum-elapsed-time": {
+      "title": "Maximum Elapsed Check (seconds)",
+      "description": "Maximum elapsed time for a site to reply to be considered good.",
+      "type": "number",
+      "default": 2,
+      "minimum": 1
     },
     "check-http-header-dict": {
-      "default": "Master default",
-      "title": "HTTP header dict to check",
+      "title": "HTTP Header Check",
       "description": "JSON object of expected HTTP header, like {\"Cache-Control\": \"max-age=3600, public\", \"Vary\": \"Accept-Encoding\"}. Note: Shall be expressed directly as object, without any additional qouting.",
-      "type": "object"
+      "type": "object",
+      "default": {}
     },
     "check-frontend-ip": {
-      "default": "Master default",
-      "title": "List of Frontend IPs to check",
+      "title": "Frontend IPs to check",
       "description": "List of Frontend IPs to check, if empty no constraint is used (default: comes from master partition).",
       "type": "array"
     },
-    "check-certificate-expiration-days": {
-      "default": "Master default",
-      "title": "Certificate expiration days check",
-      "description": "Amount of days to consider certificate as being to-be-expired (default: comes from master partition).",
-      "type": "number"
-    },
-    "check-maximum-elapsed-time": {
-      "default": "Master default",
-      "title": "Maximum elapsed time for a site to reply (seconds)",
-      "description": "Maximum elapsed time for a site to reply to be considered good.(default: comes from master partition).",
-      "type": "number"
-    },
     "failure-amount": {
-      "default": "Master default",
-      "title": "Amount of failures to consider URL as in bad state",
-      "description": "Amount of failures to consider URL as in bad state, can be set to higher value for endpoints with accepted short outages (default: comes from master partition).",
-      "type": "number"
+      "title": "Failure Amount",
+      "description": "Amount of failures to consider URL as in bad state, can be set to higher value for endpoints with accepted short outages.",
+      "type": "number",
+      "default": 2,
+      "minimum": 1
     }
   }
 }

software/monitor/instance-monitor-edgebot.cfg.jinja2

@@ -12,24 +12,12 @@
 {%-   for slave in json_module.loads(extra_slave_instance_list) | sort(attribute='slave_title') %}
 {%-   if '_' in slave %}
 {%-   do slave.update(json_module.loads(slave.pop('_'))) %}
-{%-   if 'check-status-code' not in slave %}
-{%-     do slave.__setitem__('check-status-code', int(CONFIGURATION['check-status-code'])) %}
-{%-   endif %}
-{%-   if 'check-http-header-dict' not in slave %}
-{%-     do slave.__setitem__('check-http-header-dict', CONFIGURATION['check-http-header-dict']) %}
-{%-   endif %}
-{%-   if 'check-certificate-expiration-days' not in slave %}
-{%-     do slave.__setitem__('check-certificate-expiration-days', int(CONFIGURATION['check-certificate-expiration-days'])) %}
-{%-   endif %}
-{%-   if 'failure-amount' not in slave %}
-{%-     do slave.__setitem__('failure-amount', int(CONFIGURATION['failure-amount'])) %}
-{%-   endif %}
-{%-   if 'check-maximum-elapsed-time' not in slave %}
-{%-     do slave.__setitem__('check-maximum-elapsed-time', int(CONFIGURATION['check-maximum-elapsed-time'])) %}
-{%-   endif %}
-{%-   if 'check-frontend-ip' not in slave %}
-{%-     do slave.__setitem__('check-frontend-ip', CONFIGURATION['check-frontend-ip']) %}
-{%-   endif %}
+{%-   do slave.setdefault('check-status-code', 200) %}
+{%-   do slave.setdefault('check-http-header-dict', {}) %}
+{%-   do slave.setdefault('check-certificate-expiration-days', 15) %}
+{%-   do slave.setdefault('failure-amount', 2) %}
+{%-   do slave.setdefault('check-maximum-elapsed-time', 2) %}
+{%-   do slave.setdefault('check-frontend-ip', CONFIGURATION['check-frontend-ip']) %}
 {%-   if 'url' in slave %}
 {%-     set class = slave['check-maximum-elapsed-time'] %}
 {%-     if class not in slave_instance_dict %}

software/monitor/instance.cfg

@@ -75,13 +75,8 @@ url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
 # Defaults
-configuration.check-status-code = 200
-configuration.check-http-header-dict = {}
 configuration.nameserver =
 configuration.check-frontend-ip =
-configuration.check-certificate-expiration-days = 15
-configuration.check-maximum-elapsed-time = 2
-configuration.failure-amount = 2
 # use monitor-base-port to have monitor listening on each instance
 # on different port and also on different port than other services
 # it makes it possible to instantiate it correctly on signle IP, for