software/theia: propagate monitor-instance-url parameter

software/theia/buildout.hash.cfg

@@ -31,7 +31,7 @@ md5sum = b982e83fa42103b7391d97eb36591174
 
 [instance-resilient]
 _update_hash_filename_ = instance-resilient.cfg.jinja
-md5sum = ad9499e7355ded4975ad313442cecb7a
+md5sum = f0202548a2b5fa27d909faa701c6589b
 
 [slapos-standalone-script]
 _update_hash_filename_ = slapos_standalone_script.py.jinja

software/theia/instance-resilient.cfg.jinja

@@ -18,11 +18,12 @@ parts +=
 
 
 {#- Prepare monitoring information to transmit to and request from the main theia, the clones and the PBS #}
-{%- set monitor_cors_domains = slapparameter_dict.pop('monitor-cors-domains', 'monitor.app.officejs.com') %}
+{%- set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'monitor.app.officejs.com/#page=ojsm_landing') %}
+{%- set monitor_cors_domains = urllib_parse.urlparse(monitor_interface_url).hostname %}
 {%- set monitor_username = slapparameter_dict.get('monitor-username', '${monitor-instance-parameter:username}') %}
 {%- set monitor_password = slapparameter_dict.get('monitor-password', '${monitor-htpasswd:passwd}') %}
 {%- set monitor_return = ['monitor-base-url'] %}
-{%- set monitor_parameter = {'monitor-cors-domains': monitor_cors_domains, 'monitor-username' : monitor_username, 'monitor-password': monitor_password} %}
+{%- set monitor_parameter = {'monitor-cors-domains': monitor_cors_domains, 'monitor-interface-url': monitor_interface_url, 'monitor-username' : monitor_username, 'monitor-password': monitor_password} %}
 {%- set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} %}
 
 

software/theia/instance.cfg.in

@@ -92,6 +92,7 @@ context =
   key eggs_directory buildout:eggs-directory
   key slapparameter_dict slap-configuration:configuration
   raw monitor_template ${monitor-template:output}
+  import urllib_parse six.moves.urllib.parse
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination