Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
bd73ba63
Commit
bd73ba63
authored
Oct 11, 2024
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/monitor: propagate monitoring parameters
- new buildout section
parent
450c44a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
stack/monitor/buildout.hash.cfg
stack/monitor/buildout.hash.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+6
-2
No files found.
stack/monitor/buildout.hash.cfg
View file @
bd73ba63
...
@@ -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
...
...
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
bd73ba63
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment