software/grafana: use monitoring stack for new promises

software/grafana/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = 8abfd8ce01c375257e94f64824478f5c
+md5sum = 8a745c9919eda880f3fe17ac127e2313
 
 [influxdb-config-file]
 filename = influxdb-config-file.cfg.in

software/grafana/instance.cfg.in

@@ -74,15 +74,15 @@ mode = 0644
 extensions = jinja2.ext.do
 
 [check-port-listening-promise]
-<= monitor-base-promise
+<= monitor-promise-base
 module = check_port_listening
 name = ${:_buildout_section_name_}.py
 
 [check-url-available-promise]
-recipe = slapos.cookbook:check_url_available
-path = ${directory:promise}/${:_buildout_section_name_}
-dash_path = {{ dash_bin }}
-curl_path = {{ curl_bin }}
+<= monitor-promise-base
+module = check_url_available
+name = ${:_buildout_section_name_}.py
+config-url = ${:url}
 
 [influxdb]
 ipv6 = ${instance-parameter:ipv6-random}
@@ -123,7 +123,7 @@ config-hostname = ${influxdb:ipv6}
 config-port = ${influxdb:http-port}
 
 [influxdb-password-promise]
-<= monitor-base-promise
+<= monitor-promise-base
 module = check_command_execute
 name = ${:_buildout_section_name_}.py
 config-command =

software/grafana/software.cfg

@@ -6,8 +6,6 @@ extends =
   ../../component/make/buildout.cfg
   ../../component/golang/buildout.cfg
   ../../component/openssl/buildout.cfg
-  ../../component/curl/buildout.cfg
-  ../../component/dash/buildout.cfg
   buildout.hash.cfg
   gowork.cfg
 
@@ -153,11 +151,7 @@ context =
   key grafana_homepath gowork:grafana-homepath
   key loki_bin gowork:loki-bin
   key promtail_bin gowork:promtail-bin
-  key curl_bin :curl-bin
-  key dash_bin :dash-bin
   key monitor_template monitor2-template:rendered
-curl-bin = ${curl:location}/bin/curl
-dash-bin = ${dash:location}/bin/dash
 
 [versions]
 slapos.recipe.template = 4.2