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
ba3dd231
Commit
ba3dd231
authored
Aug 29, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: check_free_disk_space promise moved to slapos.toolbox promise plugin
parent
140b987c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
software/monitor/software.cfg
software/monitor/software.cfg
+0
-1
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+0
-1
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
+10
-8
No files found.
software/monitor/software.cfg
View file @
ba3dd231
...
@@ -78,7 +78,6 @@ scripts =
...
@@ -78,7 +78,6 @@ scripts =
monitor.genstatus
monitor.genstatus
monitor.configwrite
monitor.configwrite
is-process-older-than-dependency-set
is-process-older-than-dependency-set
check-free-disk
check-computer-memory
check-computer-memory
[monitor-eggs]
[monitor-eggs]
...
...
software/re6stnet/software.cfg
View file @
ba3dd231
...
@@ -34,7 +34,6 @@ scripts =
...
@@ -34,7 +34,6 @@ scripts =
monitor.genstatus
monitor.genstatus
monitor.configwrite
monitor.configwrite
is-process-older-than-dependency-set
is-process-older-than-dependency-set
check-free-disk
[extra-eggs]
[extra-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
...
stack/monitor/buildout.hash.cfg
View file @
ba3dd231
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
# 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 =
b30c47a593299da9889035850a47c519
md5sum =
a2da18b7e1d4ae1332e19e5d1b70fcdf
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
ba3dd231
...
@@ -88,7 +88,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
...
@@ -88,7 +88,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
parameter-list =
parameter-list =
raw monitor-user ${monitor-instance-parameter:username}
raw monitor-user ${monitor-instance-parameter:username}
htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
file min-free-disk-MB ${promise-check-free-disk-space:config-file}
file min-free-disk-MB ${promise-check-free-disk-space:config-
threshold-
file}
${monitor-instance-parameter:instance-configuration}
${monitor-instance-parameter:instance-configuration}
# htpasswd entry: htpasswd key password-file username htpasswd-file
# htpasswd entry: htpasswd key password-file username htpasswd-file
...
@@ -377,13 +377,15 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url}
...
@@ -377,13 +377,15 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url}
mode = 600
mode = 600
[promise-check-free-disk-space]
[promise-check-free-disk-space]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:promise.plugin
command-line = {{ check_disk_space }}
eggs =
--collectordb ${monitor-instance-parameter:collector-db}
slapos.toolbox
--home_path ${buildout:directory}
output = ${directory:plugins}/check-free-disk-space.py
--config ${:config-file}
content =
wrapper-path = ${directory:promises}/check-free-disk-space
from slapos.promise.plugin.check_free_disk_space import RunPromise
config-file = ${directory:etc}/min-free-disk-size
mode = 600
config-collectordb = ${monitor-instance-parameter:collector-db}
config-threshold-file = ${directory:etc}/min-free-disk-size
[monitor-base]
[monitor-base]
...
...
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