fixup! XXX: stack/resilient: fix monitor integration

stack/resilient/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = b241faeb182193eb105dfe19e45835db
+md5sum = 5e0dcd4c290f0b46cb2d316dc1c9c011
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -22,11 +22,11 @@ md5sum = 9d36d08ac6ae351b598a67db41657cc6
 
 [pbsready-export]
 filename = pbsready-export.cfg.in
-md5sum = c6c11db5372150019debb1ce519b907d
+md5sum = fcbe69e3b28403e9146cfcd2b4e1edbd
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 881edc84ead2a6de3c919c2f0499d54c
+md5sum = f5695e6bcdb2a63a4990fe82b2083def
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -224,7 +224,7 @@ symlink = $${pbs:rdiff-backup-data-folder}/restore.log = $${basedirectory:log}/p
 recipe = slapos.cookbook:wrapper
 # # time-buffer is 24h (+1h of latitude)
 command-line = ${buildout:bin-directory}/check-feed-as-promise --feed-path $${pbs-resilient-status-feed:feed-path} --title --ok-pattern 'OK' --time-buffer 90000
-wrapper-path = $${basedirectory:bin}/stalled-pull-push
+wrapper-path = $${rootdirectory:bin}/stalled-pull-push
 
 [pull-push-stalled-promise]
 <= monitor-promise-base
@@ -235,7 +235,7 @@ config-command = $${pull-push-stalled-promise-bin:wrapper-path}
 [notifier-feed-status-promise-bin]
 recipe = slapos.recipe.template:jinja2
 template = ${notifier-feed-promise-template:target}
-rendered = $${basedirectory:bin}/notifier-feed-check-malformed-or-failure.py
+rendered = $${rootdirectory:bin}/notifier-feed-check-malformed-or-failure.py
 mode = 700
 context =
   key notifier_feed_directory directory:notifier-feeds

stack/resilient/pbsready-export.cfg.in

@@ -46,7 +46,7 @@ max-run = 3
 [logrotate-entry-notifier]
 rendered = ${rootdirectory:etc}/logrotate_notifier.conf
 
-[notifier-exporter-promise]
+[notifier-exporter-promise-bin]
 recipe = slapos.recipe.template:jinja2
 mode = 700
 template = inline:
@@ -56,7 +56,13 @@ template = inline:
   if [ -s "$EXPORTER_FEED" ]; then
     tail -n 1 $EXPORTER_FEED | grep -vq FAILURE_PATTERN
   fi
-rendered = ${basedirectory:promises}/exporter-status
+rendered = ${rootdirectory:bin}/exporter-status
+
+[notifier-exporter-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = exporter-status.py
+config-command = ${notifier-exporter-promise-bin:rendered}
 
 [cron-entry-backup]
 # Schedule the periodic database dump.
@@ -83,4 +89,4 @@ recipe = slapos.cookbook:publish-early
 [slap-parameter]
 # In cron.d format (i.e things like */15 * * * * are accepted).
 resiliency-backup-periodicity =
-notify =
\ No newline at end of file
+notify =

stack/resilient/pbsready.cfg.in

@@ -155,9 +155,9 @@ command = $${notifier-resilient-status-feed:wrapper-path}
 recipe = slapos.cookbook:wrapper
 # time-buffer is 24h (+1h of latitude)
 command-line = ${buildout:bin-directory}/check-feed-as-promise --feed-path $${notifier-resilient-status-feed:feed-path} --title --ok-pattern 'OK' --time-buffer 90000
-wrapper-path = $${basedirectory:bin}/stalled-notifier-callbacks
+wrapper-path = $${rootdirectory:bin}/stalled-notifier-callbacks
 
-[notifier-stalled-promise-bin]
+[notifier-stalled-promise]
 <= monitor-promise-base
 module = check_command_execute
 name = stalled-notifier-callbacks.py
@@ -251,7 +251,7 @@ input = inline:#!${bash:location}/bin/bash
   if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
     exit 1
   fi
-output = $${basedirectory:bin}/public-key-existence
+output = $${rootdirectory:bin}/public-key-existence
 mode = 700
 
 [resilient-sshkeys-sshd-promise]
@@ -267,7 +267,7 @@ config-command = $${resilient-sshkeys-sshd-promise-bin:output}
 [notifier-feed-status-promise-bin]
 recipe = slapos.recipe.template:jinja2
 template = ${notifier-feed-promise-template:target}
-rendered = $${basedirectory:bin}/notifier-feed-check-malformed-or-failure.py
+rendered = $${rootdirectory:bin}/notifier-feed-check-malformed-or-failure.py
 mode = 700
 context =
   key notifier_feed_directory directory:notifier-feeds