diff --git a/software/monitor/buildout.hash.cfg b/software/monitor/buildout.hash.cfg index ec638eb9e54d6d93d895a0c3dcd8b750e3ea9baf..ba28dfac14433ad3a9c527958d1d930a3b906444 100644 --- 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 diff --git a/software/monitor/instance-monitor.cfg.jinja2 b/software/monitor/instance-monitor.cfg.jinja2 index 6128f611a21dde4ae4e9e30baa45b4078c16eb88..5b97fccb6a94501539ae235cd0e6b64da3002e28 100644 --- 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 -command-line = {{ buildout_bin}}/check-computer-memory - -db ${monitor-instance-parameter:collector-db} - --threshold ${slap-parameter:memory-percent-threshold} - --unit percent -wrapper-path = ${directory:promises}/check-computer-memory-usage +<= monitor-promise-base +module = check_command_execute +name = check-computer-memory-usage.py +config-command = {{ buildout_bin}}/check-computer-memory -db ${monitor-instance-parameter:collector-db} --threshold ${slap-parameter:memory-percent-threshold} --unit percent [monitor-check-cpu-usage] recipe = slapos.cookbook:promise.plugin