resilient: notifier port is now dynamic, and gets a promise

slapos/recipe/notifier.py

@@ -66,6 +66,12 @@ class Callback(GenericBaseRecipe):
 
 class Notify(GenericBaseRecipe):
 
+  def __init__(self, buildout, name, options):
+    super(Notify, self).__init__(buildout, name, options)
+    log = os.path.join(options['feeds'], options['name'])
+    options['log-file'] = log
+    self.options = options
+
   def createNotifier(self, notifier_binary, wrapper, executable,
                      log, title, notification_url, feed_url, pidfile=None):
 
@@ -98,13 +104,11 @@ class Notify(GenericBaseRecipe):
                                port=self.options['port'],
                                path='/get/%s' % self.options['name'])
 
-    log = os.path.join(self.options['feeds'], self.options['name'])
-
     options = self.options
     script = self.createNotifier(notifier_binary=options['notifier-binary'],
                                  wrapper=options['wrapper'],
                                  executable=options['executable'],
-                                 log=log,
+                                 log=options['log-file'],
                                  title=options['title'],
                                  pidfile=options['pidfile'],
                                  notification_url=options['notify'],

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

@@ -71,6 +71,12 @@ database = $${rootdirectory:srv}/equeue.db
 wrapper = $${basedirectory:services}/equeue
 equeue-binary = ${buildout:bin-directory}/equeue
 
+[notifier-port]
+recipe = slapos.cookbook:free_port
+minimum = 8088
+maximum = 8097
+ip = $${notifier:host}
+
 # notifier.notify adds the [exporter, notifier] to the execution queue
 # notifier.notify.callback sets up a callback
 [notifier]
@@ -81,11 +87,10 @@ wrapper = $${basedirectory:services}/notifier
 mode = 0700
 command = ${buildout:bin-directory}/pubsubserver --callbacks $${directory:notifier-callbacks} --feeds $${directory:notifier-feeds} --equeue-socket $${equeue:socket} --logfile $${basedirectory:log}/notifier.log $${:host} $${:port}
 host = $${slap-network-information:global-ipv6}
-port = 8088
+port = $${notifier-port:port}
 context =
   key content notifier:command
 
-
 [logrotate-entry-equeue]
 <= logrotate
 recipe = slapos.cookbook:logrotate.d

stack/resilient/pbsready-export.cfg.in

@@ -18,6 +18,7 @@ parts =
   resilient-sshkeys-sshd-promise
   sshd-pbs-authorized-key
   notifier
+  notifier-exporter-promise
 
   cron-entry-backup
 
@@ -36,6 +37,12 @@ minimum = 22200
 maximum = 22209
 ip = $${slap-network-information:global-ipv6}
 
+[notifier-port]
+recipe = slapos.cookbook:free_port
+minimum = 65526
+maximum = 65535
+ip = $${notifier:host}
+
 [resilient-publish-connection-parameter]
 notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
 
@@ -51,6 +58,16 @@ wrapper = $${rootdirectory:bin}/exporter
 notify = $${slap-parameter:notify}
 pidfile = $${resilient-directory:pid}/$${:name}.pid
 
+[notifier-exporter-promise]
+recipe = slapos.recipe.template:jinja2
+mode = 700
+template = inline:
+  #!${bash:location}/bin/bash
+  EXPORTER_FEED="$${notifier-exporter:log-file}"
+  FAILURE_PATTERN="FAILURE"
+  tail -n 1 $EXPORTER_FEED | grep -vq FAILURE_PATTERN
+rendered = $${basedirectory:promises}/exporter-status
+
 [cron-entry-backup]
 # Schedule the periodic database dump.
 # Through notifications, this triggers (one or more) incremental backups on PBS instances.

stack/resilient/pbsready-import.cfg.in

@@ -42,8 +42,11 @@ maximum = 22219
 ip = $${slap-network-information:global-ipv6}
 
 # Define port of notifier (same reason)
-[notifier]
-port = 65533
+[notifier-port]
+recipe = slapos.cookbook:free_port
+minimum = 65516
+maximum = 65525
+ip = $${notifier:host}
 
 [import-on-notification]
 # notifier.callback runs a script when a notification (sent by a parent PBS)

stack/resilient/pbsready.cfg.in

@@ -165,7 +165,7 @@ callbacks = $${directory:notifier-callbacks}
 command = ${buildout:bin-directory}/pubsubserver --callbacks $${directory:notifier-callbacks} --feeds $${directory:notifier-feeds} --equeue-socket $${equeue:socket} --logfile $${basedirectory:log}/notifier.log $${:host} $${:port}
 notifier-binary = ${buildout:bin-directory}/pubsubnotifier
 host = $${slap-network-information:global-ipv6}
-port = 65534
+port = $${notifier-port:port}
 context =
   key content notifier:command