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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
2f938ea2
Commit
2f938ea2
authored
Apr 21, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Repair monitoring software release
See merge request
!737
parents
63679664
18cfae51
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
28 deletions
+10
-28
software/monitor/buildout.hash.cfg
software/monitor/buildout.hash.cfg
+1
-1
software/monitor/instance.cfg
software/monitor/instance.cfg
+2
-2
software/monitor/software.cfg
software/monitor/software.cfg
+7
-25
No files found.
software/monitor/buildout.hash.cfg
View file @
2f938ea2
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[template]
[template]
filename = instance.cfg
filename = instance.cfg
md5sum =
07873511a15df74f0be761947819ac9b
md5sum =
1b5d5a72d0d0e3156770ce8ecc5d19ce
[template-monitor]
[template-monitor]
_update_hash_filename_ = instance-monitor.cfg.jinja2
_update_hash_filename_ = instance-monitor.cfg.jinja2
...
...
software/monitor/instance.cfg
View file @
2f938ea2
...
@@ -39,7 +39,7 @@ context = import json_module json
...
@@ -39,7 +39,7 @@ context = import json_module json
section slap_configuration slap-configuration
section slap_configuration slap-configuration
raw software_type edgetest
raw software_type edgetest
key instance_base_monitor instance-base-monitor:rendered
key instance_base_monitor instance-base-monitor:rendered
key slave_instance_list slap-configuration:slave-instance-list
key slave_instance_list slap-configuration:slave-instance-list
raw buildout_bin ${buildout:bin-directory}
raw buildout_bin ${buildout:bin-directory}
raw template_json_edgetest_test ${json-test-template:target}
raw template_json_edgetest_test ${json-test-template:target}
mode = 0644
mode = 0644
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template:jinja2
template = ${template-monitor-edgebot:target}
template = ${template-monitor-edgebot:target}
rendered = $${buildout:directory}/template-monitor-edgebot.cfg
rendered = $${buildout:directory}/template-monitor-edgebot.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
surykatka-binary = ${buildout:bin-directory}/
surykatka
surykatka-binary = ${buildout:bin-directory}/
${surykatka:script-name}
template-surykatka-ini = ${template-surykatka-ini:target}
template-surykatka-ini = ${template-surykatka-ini:target}
context = import json_module json
context = import json_module json
...
...
software/monitor/software.cfg
View file @
2f938ea2
...
@@ -10,7 +10,7 @@ extends =
...
@@ -10,7 +10,7 @@ extends =
python = python3
python = python3
parts =
parts =
slapos-cookbook
slapos-cookbook
network-bench-cfg
network-bench-cfg
json-test-template
json-test-template
...
@@ -20,13 +20,13 @@ parts =
...
@@ -20,13 +20,13 @@ parts =
monitor-collect-csv-dump
monitor-collect-csv-dump
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[template-monitor]
[template-monitor]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_update_hash_filename_}
url = ${:_profile_base_location_}/${:_update_hash_filename_}
mode = 0644
mode = 0644
...
@@ -61,31 +61,13 @@ url = ${:_profile_base_location_}/script/${:filename}
...
@@ -61,31 +61,13 @@ url = ${:_profile_base_location_}/script/${:filename}
filename = collect_csv_dump.py
filename = collect_csv_dump.py
output = ${:destination}/${:filename}
output = ${:destination}/${:filename}
[extra-eggs]
[surykatka]
<= monitor-eggs
recipe = zc.recipe.egg
interpreter = pythonwitheggs
script-name = ${:_buildout_section_name_}
eggs +=
${lxml-python:egg}
${pycurl:egg}
${python-cryptography:egg}
slapos.toolbox
slapos.core
surykatka
scripts =
networkbench
onetimedownload
monitor.bootstrap
monitor.collect
monitor.runpromise
monitor.genstatus
monitor.configwrite
check-computer-memory
surykatka
[monitor-eggs]
[monitor-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs +=
eggs +=
slapos.cookbook
slapos.cookbook
slapos.recipe.cmmi
slapos.recipe.cmmi
hexagonit.recipe.download
hexagonit.recipe.download
...
...
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