Commit e9f61492 authored by Xavier Thompson's avatar Xavier Thompson

software/theia: Add resilient root in aggregated monitoring

parent 86d6869a
...@@ -31,7 +31,7 @@ md5sum = 190a736471f0e0cffcb2838968e01d84 ...@@ -31,7 +31,7 @@ md5sum = 190a736471f0e0cffcb2838968e01d84
[instance-resilient] [instance-resilient]
_update_hash_filename_ = instance-resilient.cfg.jinja _update_hash_filename_ = instance-resilient.cfg.jinja
md5sum = 6f6b88d2802cd5eba6e3d2ebf435813a md5sum = b1e338973bc9cfe1bb4e16d46b3c6da9
[theia-common] [theia-common]
_update_hash_filename_ = theia_common.py _update_hash_filename_ = theia_common.py
......
...@@ -21,9 +21,9 @@ parts += ...@@ -21,9 +21,9 @@ parts +=
{%- set monitor_cors_domains = slapparameter_dict.pop('monitor-cors-domains', 'monitor.app.officejs.com') %} {%- set monitor_cors_domains = slapparameter_dict.pop('monitor-cors-domains', 'monitor.app.officejs.com') %}
{%- set monitor_username = slapparameter_dict.get('monitor-username', '${monitor-instance-parameter:username}') %} {%- 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_password = slapparameter_dict.get('monitor-password', '${monitor-htpasswd:passwd}') %}
{%- set monitor_return = ['monitor-base-url', 'monitor-setup-url'] %} {%- 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-username' : monitor_username, 'monitor-password': monitor_password} %}
{%- set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} %} {%- set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} %}
{# Generate the sections to request the main theia, the clones and the PBS. #} {# Generate the sections to request the main theia, the clones and the PBS. #}
...@@ -43,6 +43,6 @@ url = ${request-theia:connection-url} ...@@ -43,6 +43,6 @@ url = ${request-theia:connection-url}
username = ${request-theia:connection-username} username = ${request-theia:connection-username}
password = ${request-theia:connection-password} password = ${request-theia:connection-password}
backend-url = ${request-theia:connection-backend-url} backend-url = ${request-theia:connection-backend-url}
monitor-base-url = ${request-theia:connection-monitor-base-url} monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${request-theia:connection-monitor-setup-url} monitor-setup-url = ${monitor-publish:monitor-setup-url}
<= publish-connection-information <= publish-connection-information
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment