Commit bd73ba63 authored by Roque's avatar Roque

stack/monitor: propagate monitoring parameters

- new buildout section
parent 450c44a9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = 39258fb8dea4da11c3cbda0a24b1f1a6 md5sum = ebb67d4d4e9c9de6f45a11eadca67b24
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
...@@ -326,6 +326,10 @@ monitor-url = ${:monitor-base-url}/public/feeds ...@@ -326,6 +326,10 @@ monitor-url = ${:monitor-base-url}/public/feeds
monitor-user = ${monitor-instance-parameter:username} monitor-user = ${monitor-instance-parameter:username}
monitor-password = ${monitor-instance-parameter:password} monitor-password = ${monitor-instance-parameter:password}
[monitor-parameters-propagation]
config-monitor-cors-domains = ${slap-configuration:configuration.monitor-cors-domains}
config-monitor-interface-url = ${slap-configuration:configuration.monitor-interface-url}
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-title = ${slap-configuration:instance-title} monitor-title = ${slap-configuration:instance-title}
monitor-httpd-ipv6 = ${slap-configuration:ipv6-random} monitor-httpd-ipv6 = ${slap-configuration:ipv6-random}
...@@ -335,7 +339,7 @@ monitor-base-url = ${monitor-frontend:connection-secure_access} ...@@ -335,7 +339,7 @@ monitor-base-url = ${monitor-frontend:connection-secure_access}
#monitor-base-url = ${monitor-httpd-conf-parameter:url} #monitor-base-url = ${monitor-httpd-conf-parameter:url}
root-instance-title = ${slap-configuration:root-instance-title} root-instance-title = ${slap-configuration:root-instance-title}
monitor-url-list = monitor-url-list =
cors-domains = ${slap-configuration:configuration.monitor-cors-domains} cors-domains = ${monitor-parameters-propagation:config-monitor-cors-domains}
# XXX Hard coded parameter # XXX Hard coded parameter
collector-db = /srv/slapgrid/var/data-log/collector.db collector-db = /srv/slapgrid/var/data-log/collector.db
# Credentials # Credentials
...@@ -343,7 +347,7 @@ password = ${monitor-htpasswd:passwd} ...@@ -343,7 +347,7 @@ password = ${monitor-htpasswd:passwd}
username = admin username = admin
instance-configuration = instance-configuration =
configuration-file-path = ${monitor-directory:etc}/monitor_knowledge0.cfg configuration-file-path = ${monitor-directory:etc}/monitor_knowledge0.cfg
interface-url = ${slap-configuration:configuration.monitor-interface-url} interface-url = ${monitor-parameters-propagation:config-monitor-interface-url}
[monitor-frontend] [monitor-frontend]
<= slap-connection <= slap-connection
......
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