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
Boxiang Sun
slapos
Commits
3607fde4
Commit
3607fde4
authored
9 years ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: Include skeleton of distributor software type
parent
48526c68
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
27 deletions
+55
-27
software/monitor/instance-monitor-distributor.cfg.jinja2
software/monitor/instance-monitor-distributor.cfg.jinja2
+3
-0
software/monitor/instance-monitor.cfg.jinja2
software/monitor/instance-monitor.cfg.jinja2
+19
-18
software/monitor/instance.cfg
software/monitor/instance.cfg
+21
-4
software/monitor/software.cfg
software/monitor/software.cfg
+12
-5
No files found.
software/monitor/instance-monitor-distributor.cfg.jinja2
0 → 100644
View file @
3607fde4
[buildout]
extends = {{ instance_base_monitor }}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
software/monitor/instance-monitor.cfg.jinja2
View file @
3607fde4
...
...
@@ -22,11 +22,11 @@ parts =
symlink-re6st-logs
symlink-collected-logs
extends =
${monitor-template:output
}
extends =
{{ monitor_template_output }
}
eggs-directory =
${buildout:eggs-directory
}
develop-eggs-directory =
${buildout:develop-eggs-directory
}
eggs-directory =
{{ eggs_directory }
}
develop-eggs-directory =
{{ develop_eggs_directory }
}
offline = true
[cron-network-bench]
...
...
@@ -34,22 +34,22 @@ offline = true
recipe = slapos.cookbook:cron.d
name = network-bench-test
frequency = */10 * * * *
command =
${buildout:bin-directory}/networkbench $${network-bench-configuration:rendered} $
${monitor-directory:monitor-log}
command =
{{ buildout }}/networkbench ${network-bench-configuration:rendered}
${monitor-directory:monitor-log}
[symlink-re6st-logs]
recipe = cns.recipe.symlink
symlink = /var/log/re6stnet = $
$
{monitor-directory:system-log}/re6stnet
symlink = /var/log/re6stnet = ${monitor-directory:system-log}/re6stnet
autocreate = true
[symlink-collected-logs]
recipe = cns.recipe.symlink
symlink = /srv/slapgrid/var/data-log = $
$
{monitor-directory:server-log}/data-log
symlink = /srv/slapgrid/var/data-log = ${monitor-directory:server-log}/data-log
autocreate = true
[network-bench-configuration]
recipe = slapos.recipe.template:jinja2
template =
${network-bench-cfg:output
}
rendered = $
$
{monitor-directory:etc}/network_bench.cfg
template =
{{ network_benck_cfg_output }
}
rendered = ${monitor-directory:etc}/network_bench.cfg
mode = 0744
context =
key slapparameter_dict slap-parameters:configuration
...
...
@@ -66,24 +66,25 @@ user = admin
bytes = 16
[monitor-directory]
server-log = $
$
{:private-directory}/server-log
monitor-log = $
$
{:private-directory}/monitor-log
cache = $
$
{:var}/cache
mod-ssl = $
$
{:cache}/httpd_mod_ssl
system-log = $
$
{:private-directory}/system-log
server-log = ${:private-directory}/server-log
monitor-log = ${:private-directory}/monitor-log
cache = ${:var}/cache
mod-ssl = ${:cache}/httpd_mod_ssl
system-log = ${:private-directory}/system-log
[slap-parameter]
private-hash = $
${pwgen:passwd}$
${pwgen32:passwd}
private-hash = $
{pwgen:passwd}
${pwgen32:passwd}
frontend-domain =
[monitor-frontend]
recipe = slapos.cookbook:requestoptional
name = Monitor Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = product.frontend
software-type = custom-personal
slave = true
config-url = $
$
{monitor-parameters:url}
config-domain = $
$
{slap-parameter:frontend-domain}
config-url = ${monitor-parameters:url}
config-domain = ${slap-parameter:frontend-domain}
return = site_url domain
server-url = $${slap-connection:server-url}
...
...
This diff is collapsed.
Click to expand it.
software/monitor/instance.cfg
View file @
3607fde4
...
...
@@ -7,17 +7,32 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = $${instance-base-runner:rendered}
default = $${instance-base-monitor:rendered}
distributor = $${instance-base-distributor:rendered}
[instance-base-
runne
r]
[instance-base-
monito
r]
recipe = slapos.recipe.template:jinja2
template = ${template-monitor:
output
}
template = ${template-monitor:
destination
}
rendered = $${buildout:directory}/template-monitor.cfg
extensions = jinja2.ext.do
context = key buildout buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
key monitor_template_output slap-configuration:monitor_template_output
key network_benck_cfg_output slap-configuration:network_benck_cfg_output
mode = 0644
[instance-base-distributor]
recipe = slapos.recipe.template:jinja2
template = ${template-monitor-distributor:destination}
rendered = $${buildout:directory}/template-monitor-distributor.cfg
extensions = jinja2.ext.do
context = key buildout buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
key instance_base_monitor instance-base-monitor:rendered
mode = 0644
[slap-configuration]
...
...
@@ -27,3 +42,5 @@ partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
monitor_template_output = ${monitor-template:output}
network_benck_cfg_output = ${network-bench-cfg:output}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
software/monitor/software.cfg
View file @
3607fde4
...
...
@@ -11,6 +11,7 @@ parts =
slapos-toolbox
template
network-bench-cfg
template-monitor-distributor
template-monitor
eggs
fluentd
...
...
@@ -19,14 +20,21 @@ parts =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
md5sum =
daf1125d0d67b6b140a4b6de8c8e35f3
md5sum =
4402626ed57cc9e27eb4282839fbfb99
mode = 0644
[template-monitor]
recipe = slapos.recipe.
template
recipe = slapos.recipe.
build:download
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
output = ${buildout:directory}/template-monitor.cfg
md5sum = bf6bb18ed86fcb450e5e23d7815a208f
destination = ${buildout:directory}/template-monitor.cfg
md5sum = c11064c5b529b9dfeec6549f04dfd078
mode = 0644
[template-monitor-distributor]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor-distributor.cfg.jinja2
destination = ${buildout:directory}/template-monitor-distributor.cfg
md5sum = a58e9c20ab71d7353d4dae6daaccbd31
mode = 0644
# stupify index for now
...
...
@@ -45,7 +53,6 @@ md5sum = cfcbf2002b8eff5153e2bf68ed24b720
output = ${buildout:directory}/template-network-bench-cfg.in
mode = 0644
[slapos-toolbox]
recipe = zc.recipe.egg
eggs =
...
...
This diff is collapsed.
Click to expand it.
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