software/monitor: Switch to monitor-promise-base

b199000a · Łukasz Nowak · Łukasz Nowak · 1b0853e2 · b199000a · b199000a
Commit b199000a authored Sep 27, 2019 by Łukasz Nowak Committed by Łukasz Nowak Nov 19, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

software/monitor/buildout.hash.cfg software/monitor/buildout.hash.cfg +1 -1

software/monitor/instance-monitor.cfg.jinja2 software/monitor/instance-monitor.cfg.jinja2 +4 -6

No files found.
--- a/software/monitor/buildout.hash.cfg
+++ b/software/monitor/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = 1b7d2d097f208f6641bf98a17df079c8
 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2
-md5sum = dffe797be3a66d6838ffc70ee8f5f3ff
+md5sum = 373c79480e6425c20480fc911a56c3fd
 [template-monitor-distributor]
 _update_hash_filename_ = instance-monitor-distributor.cfg.jinja2

--- a/software/monitor/instance-monitor.cfg.jinja2
+++ b/software/monitor/instance-monitor.cfg.jinja2
@@ -80,12 +80,10 @@ command-line =
 wrapper-path = ${monitor-directory:bin}/monitor-collect-csv-dump  
 [monitor-check-memory-usage]
-recipe = slapos.cookbook:wrapper
+<= monitor-promise-base
-command-line = {{ buildout_bin}}/check-computer-memory
+module = check_command_execute
-               -db ${monitor-instance-parameter:collector-db}
+name = check-computer-memory-usage.py
-               --threshold ${slap-parameter:memory-percent-threshold}
+config-command = {{ buildout_bin}}/check-computer-memory -db ${monitor-instance-parameter:collector-db} --threshold ${slap-parameter:memory-percent-threshold} --unit percent
-               --unit percent
-wrapper-path = ${directory:promises}/check-computer-memory-usage
 [monitor-check-cpu-usage]
 recipe = slapos.cookbook:promise.plugin