runner: update resilient monitor and move import/export scripts outside recipe

software/slaprunner/common.cfg

@@ -47,6 +47,14 @@ output = ${buildout:directory}/template-runner.cfg.in
 md5sum = b30d71f2f0abfecc2638fe6b804f3c43
 mode = 0644
 
+[template-runner-import-script]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
+download-only = true
+#md5sum = 7c0608eafb5c6998846851744a70b3de
+filename = runner-import.sh.jinja2
+mode = 0644
+
 [instance-runner-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
@@ -54,6 +62,14 @@ output = ${buildout:directory}/instance-runner-import.cfg
 md5sum = 202c40bcca67d70a3c79d218be853b10
 mode = 0644
 
+[template-runner-export-script]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
+download-only = true
+#md5sum = 7c0608eafb5c6998846851744a70b3de
+filename = runner-export.sh.jinja2
+mode = 0644
+
 [instance-runner-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in

software/slaprunner/instance-runner-export.cfg.in

@@ -26,39 +26,40 @@ parts +=
   cron-entry-backup
   cron-entry-prepare-software
   deploy-instance-parameters
+## Monitoring part
 ###Parts to add for monitoring
-  slap-parameters
   certificate-authority
-  cron
   cron-entry-monitor
   cron-entry-rss
   deploy-index
-  deploy-index-template
-  deploy-monitor-script
-  deploy-rss-script
   deploy-settings-cgi
   deploy-status-cgi
-  make-rss
-  monitor-frontend
-  monitor-promise
   setup-static-files
   certificate-authority
-  public
   zero-parameters
-  cgi-httpd-wrapper
   public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
+## Monitor for runner
+  monitor-current-log-access
+
 
 [exporter]
-recipe = slapos.cookbook:slaprunner.export
-wrapper = $${directory:bin}/$${slap-parameter:namebase}-exporter
-srv-directory = $${directory:srv}
-etc-directory = $${directory:etc}
-backup-directory = $${directory:backup}
-shell-binary = ${dash:location}/bin/dash
-rsync-binary = ${rsync:location}/bin/rsync
+recipe = slapos.recipe.template:jinja2
+template = ${template-runner-export-script:location}/${template-runner-export-script:filename}
+rendered = $${directory:bin}/$${slap-parameter:namebase}-exporter
+# backward compatibility for resilient stack
+wrapper = $${:rendered}
+mode = 700
+context =
+  section directory directory
+  raw  shell_binary ${dash:location}/bin/dash
+  raw  rsync_binary ${rsync:location}/bin/rsync
 
 [monitor-promise]
-url = $${monitor-frontend:config-url}/$${deploy-index:filename}
+url = $${monitor-frontend:config-url}/$${deploy-index-template:filename}
 
 # Extends publish section with resilient parameters
 [publish-connection-informations]

software/slaprunner/instance-runner-import.cfg.in

@@ -25,37 +25,43 @@ parts +=
   deploy-instance-parameters
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
+## Monitoring part
 ###Parts to add for monitoring
-  slap-parameters
   certificate-authority
-  cron
   cron-entry-monitor
   cron-entry-rss
   deploy-index
-  deploy-index-template
-  deploy-monitor-script
-  deploy-rss-script
   deploy-settings-cgi
   deploy-status-cgi
-  make-rss
-  monitor-promise
   setup-static-files
   certificate-authority
-  public
   zero-parameters
-  cgi-httpd-wrapper
   public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
+## Monitor for runner
+  monitor-current-log-access
+  monitor-backup-log-access
 
 [importer]
-recipe = slapos.cookbook:slaprunner.import
-wrapper = $${directory:bin}/$${slap-parameter:namebase}-importer
-srv-directory = $${directory:srv}
-etc-directory = $${directory:etc}
-backup-directory = $${directory:backup}
-shell-binary = ${dash:location}/bin/dash
-rsync-binary = ${rsync:location}/bin/rsync
-curl-binary = ${curl:location}/bin/curl
-backend-url = $${slaprunner:access-url}
+recipe = slapos.recipe.template:jinja2
+template = ${template-runner-import-script:location}/${template-runner-import-script:filename}
+rendered = $${directory:bin}/$${slap-parameter:namebase}-importer
+# backward compatibility for resilient stack
+wrapper = $${:rendered}
+mode = 700
+context =
+  key backend_url slaprunner:access-url
+  section directory directory
+  raw  shell_binary ${dash:location}/bin/dash
+  raw  rsync_binary ${rsync:location}/bin/rsync
+  raw  curl_binary ${curl:location}/bin/curl
 
 [slap-parameter]
 auto-deploy-instance = false
+
+[monitor-backup-log-access]
+< = monitor-directory-access
+source = $${directory:logrotate-backup}

software/slaprunner/template/runner-export.sh.jinja2

+#!{{ shell_binary }}
+umask 077
+sync_element () {
+  path=$1
+  backup_path=$2
+  shift 2
+  element_list=$*
+  for element in $element_list
+  do
+    cd $path;
+    if [ -f $element ] || [ -d $element ]; then
+       {{ rsync_binary }} -avz --safe-links --delete $element  $backup_path;
+    fi
+  done
+}
+sync_element {{ directory['srv'] }}/runner  {{ directory['backup'] }}/runner/ instance project  proxy.db
+# We sync .* appart
+date +%s -u > {{ directory['etc'] }}/.resilient-timestamp
+cp -r {{ directory['etc'] }}/.??* {{ directory['backup'] }}/etc/
+sync_element {{ directory['etc'] }}  {{ directory['backup'] }}/etc/ config.json ssh
+if [ -d {{ directory['backup'] }}/runner/software ]; then
+  rm {{ directory['backup'] }}/runner/software/*
+fi

software/slaprunner/template/runner-import.sh.jinja2

+#!{{ shell_binary }}
+umask 077
+restore_element () {
+  backup_path=$1
+  restore_path=$2
+  shift 2
+  element_list=$*
+  for element in $element_list
+  do
+    cd $backup_path;
+    if [ -f $element ] || [ -d $element ]; then
+       {{ rsync_binary }} -avz --delete $backup_path/$element $restore_path;
+    fi
+  done
+}
+restore_element {{ directory['backup'] }}/runner/ {{ directory['srv'] }}/runner  instance project  proxy.db
+restore_element  {{ directory['backup'] }}/etc/ {{ directory['etc'] }} config.json ssh
+cp -r {{ directory['backup'] }}/etc/.??* {{ directory['etc'] }};
+{{ curl_binary }} --insecure -vg6L --max-time 5  {{ backend_url }}/isSRReady;