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
Aurel
slapos
Commits
6229807b
Commit
6229807b
authored
Sep 27, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Nov 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/slapos-master: Switch to monitor-promise-base
parent
6d31b7e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+2
-2
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+13
-11
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+0
-1
No files found.
software/slapos-master/buildout.hash.cfg
View file @
6229807b
...
@@ -14,11 +14,11 @@
...
@@ -14,11 +14,11 @@
# not need these here).
# not need these here).
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
e46c20fa51e15972b225731b83b09889
md5sum =
2ef0ddc206c6b0982a37cfc21f23e423
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum = e
8033d4fd7b6348b525a6148762ccdb4
md5sum = e
f86e09e44ac67a9b15939df0ab4a466
[template-apache-backend-conf]
[template-apache-backend-conf]
filename = apache-backend.conf.in
filename = apache-backend.conf.in
...
...
software/slapos-master/instance-balancer.cfg.in
View file @
6229807b
...
@@ -187,10 +187,11 @@ input = inline:
...
@@ -187,10 +187,11 @@ input = inline:
[{{ section('apache-promise') }}]
[{{ section('apache-promise') }}]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
recipe = slapos.cookbook:check_port_listening
<= monitor-promise-base
path = ${directory:promise}/apache
module = check_port_listening
hostname = {{ ipv4 }}
name = apache.py
port = {{ apache_dict.values()[0][0] }}
config-hostname = {{ ipv4 }}
config-port = {{ apache_dict.values()[0][0] }}
[{{ section('publish') }}]
[{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
...
@@ -229,7 +230,6 @@ recipe = slapos.cookbook:mkdirectory
...
@@ -229,7 +230,6 @@ recipe = slapos.cookbook:mkdirectory
apache-conf = ${:etc}/apache
apache-conf = ${:etc}/apache
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
promise = ${:etc}/promise
services = ${:etc}/run
services = ${:etc}/run
services-on-watch = ${:etc}/service
services-on-watch = ${:etc}/service
var = ${buildout:directory}/var
var = ${buildout:directory}/var
...
@@ -273,14 +273,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }}
...
@@ -273,14 +273,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }}
promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }}
promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }}
[{{ section('monitor-promise-apachedex-result') }}]
[{{ section('monitor-promise-apachedex-result') }}]
recipe = slapos.cookbook:wrapper
<= monitor-promise-base
wrapper-path = ${directory:promise}/check-apachedex-result
module = check_command_execute
command-line = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
name = check-apachedex-result.py
config-command = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
[{{ section('promise-check-computer-memory') }}]
[{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper
<= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory
module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
6229807b
...
@@ -65,7 +65,6 @@ config-name = {{ name }}
...
@@ -65,7 +65,6 @@ config-name = {{ name }}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
promise = ${:etc}/promise
service-on-watch = ${:etc}/service
service-on-watch = ${:etc}/service
srv = ${buildout:directory}/srv
srv = ${buildout:directory}/srv
backup-caucased = ${:srv}/backup/caucased
backup-caucased = ${:srv}/backup/caucased
...
...
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