monitor: move promise to check if slapgrid succeed to monitor stack

software/monitor/instance-monitor.cfg.jinja2

@@ -10,7 +10,6 @@ parts =
   monitor-collect-csv-wrapper
   fluentd-wrapper
   monitor-base
-  promise-check-slapgrid
   publish-connection-information
 
 
@@ -106,17 +105,6 @@ recipe = slapos.cookbook:publish
 monitor-setup-url = https://monitor.app.officejs.com/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
 server_log_url = ${publish:monitor-base-url}/${slap-configuration:private-hash}/ 
 
-[promise-check-slapgrid]
-recipe = collective.recipe.template
-error-log-file = ${buildout:directory}/.slapgrid-${slap-connection:partition-id}-error.log
-input = inline:#!/bin/sh
-  if [ -f "${:error-log-file}" ]; then
-    >&2 cat ${:error-log-file}
-    exit 1
-  fi
-output = ${monitor-directory:promises}/slapgrid-${slap-connection:partition-id}-status
-mode = 700
-
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = ${slap-connection:computer-id}

software/monitor/software.cfg

@@ -32,7 +32,7 @@ mode = 0644
 recipe = slapos.recipe.build:download 
 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
 destination = ${buildout:directory}/template-base-monitor.cfg
-md5sum = ec16fdaa0e6e13dcc7d3007908182c20
+md5sum = 20738a1b16de234e8bb7e88c822552b9
 mode = 0644
 
 [template-monitor-distributor]
@@ -90,6 +90,12 @@ eggs +=
 scripts =
   networkbench
   onetimedownload
+  monitor.bootstrap
+  monitor.collect
+  monitor.runpromise
+  monitor.genstatus
+  monitor.genrss
+  monitor.configwrite
 
 [fluentd]
 gems += 

stack/monitor/buildout.cfg

@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 5b6b7a96bfa1e0ca83310caa48ed7b20
+md5sum = 188989c4d47aba9f6e5de99a8b72aeaf
 context =
     key apache_location apache:location
     key gzip_location gzip:location

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -390,6 +390,17 @@ input = inline:#!{{ dash_executable_location }}
 output = ${directory:promises}/monitor-bootstrap-status
 mode = 700
 
+[promise-check-slapgrid]
+recipe = collective.recipe.template
+error-log-file = ${buildout:directory}/.slapgrid-${slap-connection:partition-id}-error.log
+input = inline:#!/bin/sh
+  if [ -f "${:error-log-file}" ]; then
+    >&2 cat ${:error-log-file}
+    exit 1
+  fi
+output = ${monitor-directory:promises}/buildout-${slap-connection:partition-id}-status
+mode = 700
+
 [monitor-base]
 # create dependencies between required monitor parts
 recipe = plone.recipe.command
@@ -407,6 +418,7 @@ depends =
   ${monitor-httpd-promise:filename}
   ${monitor-status2rss-cron-entry:name}
   ${monitor-bootstrap-promise:file}
+  ${promise-check-slapgrid:output}
 
 [monitor-publish]
 monitor-base-url = ${publish:monitor-base-url}