Repair monitoring software release

See merge request !737

software/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 07873511a15df74f0be761947819ac9b
+md5sum = 1b5d5a72d0d0e3156770ce8ecc5d19ce
 
 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2

software/monitor/instance.cfg

@@ -39,7 +39,7 @@ context = import json_module json
           section slap_configuration slap-configuration
           raw software_type edgetest
           key instance_base_monitor instance-base-monitor:rendered
-          key slave_instance_list slap-configuration:slave-instance-list 
+          key slave_instance_list slap-configuration:slave-instance-list
           raw buildout_bin ${buildout:bin-directory}
           raw template_json_edgetest_test ${json-test-template:target}
 mode = 0644
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${template-monitor-edgebot:target}
 rendered = $${buildout:directory}/template-monitor-edgebot.cfg
 extensions = jinja2.ext.do
-surykatka-binary = ${buildout:bin-directory}/surykatka
+surykatka-binary = ${buildout:bin-directory}/${surykatka:script-name}
 template-surykatka-ini = ${template-surykatka-ini:target}
 
 context = import json_module json

software/monitor/software.cfg

@@ -10,7 +10,7 @@ extends =
 
 python = python3
 
-parts = 
+parts =
   slapos-cookbook
   network-bench-cfg
   json-test-template
@@ -20,13 +20,13 @@ parts =
   monitor-collect-csv-dump
 
 [template]
-recipe = slapos.recipe.template 
+recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-monitor]
-recipe = slapos.recipe.build:download 
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
@@ -61,31 +61,13 @@ url = ${:_profile_base_location_}/script/${:filename}
 filename = collect_csv_dump.py
 output = ${:destination}/${:filename}
 
-[extra-eggs]
-<= monitor-eggs
-interpreter = pythonwitheggs
-eggs +=
-  ${lxml-python:egg}
-  ${pycurl:egg}
-  ${python-cryptography:egg}
-  slapos.toolbox
-  slapos.core
-  surykatka
-
-scripts =
-  networkbench
-  onetimedownload
-  monitor.bootstrap
-  monitor.collect
-  monitor.runpromise
-  monitor.genstatus
-  monitor.configwrite
-  check-computer-memory
-  surykatka
+[surykatka]
+recipe = zc.recipe.egg
+script-name = ${:_buildout_section_name_}
 
 [monitor-eggs]
 recipe = zc.recipe.egg
-eggs += 
+eggs +=
   slapos.cookbook
   slapos.recipe.cmmi
   hexagonit.recipe.download