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
Kwabena Antwi-Boasiako
slapos
Commits
e82d69be
Commit
e82d69be
authored
Jan 06, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: move promise to check if slapgrid succeed to monitor stack
parent
e3539b57
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
14 deletions
+20
-14
software/monitor/instance-monitor.cfg.jinja2
software/monitor/instance-monitor.cfg.jinja2
+0
-12
software/monitor/software.cfg
software/monitor/software.cfg
+7
-1
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+12
-0
No files found.
software/monitor/instance-monitor.cfg.jinja2
View file @
e82d69be
...
@@ -10,7 +10,6 @@ parts =
...
@@ -10,7 +10,6 @@ parts =
monitor-collect-csv-wrapper
monitor-collect-csv-wrapper
fluentd-wrapper
fluentd-wrapper
monitor-base
monitor-base
promise-check-slapgrid
publish-connection-information
publish-connection-information
...
@@ -106,17 +105,6 @@ recipe = slapos.cookbook:publish
...
@@ -106,17 +105,6 @@ recipe = slapos.cookbook:publish
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
server_log_url = ${publish:monitor-base-url}/${slap-configuration:private-hash}/
server_log_url = ${publish:monitor-base-url}/${slap-configuration:private-hash}/
[promise-check-slapgrid]
recipe = collective.recipe.template
error-log-file = ${buildout:directory}/.slapgrid-${slap-connection:partition-id}-error.log
input = inline:#!/bin/sh
if [ -f "${:error-log-file}" ]; then
>&2 cat ${:error-log-file}
exit 1
fi
output = ${monitor-directory:promises}/slapgrid-${slap-connection:partition-id}-status
mode = 700
[slap-configuration]
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id}
computer = ${slap-connection:computer-id}
...
...
software/monitor/software.cfg
View file @
e82d69be
...
@@ -32,7 +32,7 @@ mode = 0644
...
@@ -32,7 +32,7 @@ mode = 0644
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
destination = ${buildout:directory}/template-base-monitor.cfg
destination = ${buildout:directory}/template-base-monitor.cfg
md5sum =
ec16fdaa0e6e13dcc7d3007908182c20
md5sum =
20738a1b16de234e8bb7e88c822552b9
mode = 0644
mode = 0644
[template-monitor-distributor]
[template-monitor-distributor]
...
@@ -90,6 +90,12 @@ eggs +=
...
@@ -90,6 +90,12 @@ eggs +=
scripts =
scripts =
networkbench
networkbench
onetimedownload
onetimedownload
monitor.bootstrap
monitor.collect
monitor.runpromise
monitor.genstatus
monitor.genrss
monitor.configwrite
[fluentd]
[fluentd]
gems +=
gems +=
...
...
stack/monitor/buildout.cfg
View file @
e82d69be
...
@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg
filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg
rendered = ${buildout:directory}/template-monitor.cfg
md5sum =
5b6b7a96bfa1e0ca83310caa48ed7b20
md5sum =
188989c4d47aba9f6e5de99a8b72aeaf
context =
context =
key apache_location apache:location
key apache_location apache:location
key gzip_location gzip:location
key gzip_location gzip:location
...
...
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
e82d69be
...
@@ -390,6 +390,17 @@ input = inline:#!{{ dash_executable_location }}
...
@@ -390,6 +390,17 @@ input = inline:#!{{ dash_executable_location }}
output = ${directory:promises}/monitor-bootstrap-status
output = ${directory:promises}/monitor-bootstrap-status
mode = 700
mode = 700
[promise-check-slapgrid]
recipe = collective.recipe.template
error-log-file = ${buildout:directory}/.slapgrid-${slap-connection:partition-id}-error.log
input = inline:#!/bin/sh
if [ -f "${:error-log-file}" ]; then
>&2 cat ${:error-log-file}
exit 1
fi
output = ${monitor-directory:promises}/buildout-${slap-connection:partition-id}-status
mode = 700
[monitor-base]
[monitor-base]
# create dependencies between required monitor parts
# create dependencies between required monitor parts
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -407,6 +418,7 @@ depends =
...
@@ -407,6 +418,7 @@ depends =
${monitor-httpd-promise:filename}
${monitor-httpd-promise:filename}
${monitor-status2rss-cron-entry:name}
${monitor-status2rss-cron-entry:name}
${monitor-bootstrap-promise:file}
${monitor-bootstrap-promise:file}
${promise-check-slapgrid:output}
[monitor-publish]
[monitor-publish]
monitor-base-url = ${publish:monitor-base-url}
monitor-base-url = ${publish:monitor-base-url}
...
...
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