feat(fs): 0.0.1

Fixes #2140

@xen-orchestra/babel-config/index.js

@@ -1,40 +1,56 @@
 'use strict'
 
-const PLUGINS_RE = /^(?:@babel\/plugin-.+|babel-plugin-lodash)$/
+const PLUGINS_RE = /^(?:@babel\/|babel-)plugin-.+$/
 const PRESETS_RE = /^@babel\/preset-.+$/
 
 const NODE_ENV = process.env.NODE_ENV || 'development'
 const __PROD__ = NODE_ENV === 'production'
 const __TEST__ = NODE_ENV === 'test'
 
+const configs = {
+  '@babel/plugin-proposal-decorators': {
+    legacy: true,
+  },
+  '@babel/preset-env' (pkg) {
+    return {
+      debug: !__TEST__,
+      loose: true,
+      shippedProposals: true,
+      targets: __PROD__
+        ? (() => {
+            let node = (pkg.engines || {}).node
+            if (node !== undefined) {
+              const trimChars = '^=>~'
+              while (trimChars.includes(node[0])) {
+                node = node.slice(1)
+              }
+              return { node: node }
+            }
+          })()
+        : { browsers: '', node: 'current' },
+      useBuiltIns: '@babel/polyfill' in (pkg.dependencies || {}) && 'usage',
+    }
+  },
+}
+
+const getConfig = (key, ...args) => {
+  const config = configs[key]
+  return config === undefined
+    ? {}
+    : typeof config === 'function'
+      ? config(...args)
+      : config
+}
+
 module.exports = function (pkg, plugins, presets) {
   plugins === undefined && (plugins = {})
-
   presets === undefined && (presets = {})
-  presets['@babel/preset-env'] = {
-    debug: !__TEST__,
-    loose: true,
-    shippedProposals: true,
-    targets: __PROD__
-      ? (() => {
-        let node = (pkg.engines || {}).node
-        if (node !== undefined) {
-          const trimChars = '^=>~'
-          while (trimChars.includes(node[0])) {
-            node = node.slice(1)
-          }
-          return { node: node }
-        }
-      })()
-      : { browsers: '', node: 'current' },
-    useBuiltIns: '@babel/polyfill' in (pkg.dependencies || {}) && 'usage',
-  }
 
   Object.keys(pkg.devDependencies || {}).forEach(name => {
     if (!(name in presets) && PLUGINS_RE.test(name)) {
-      plugins[name] = {}
+      plugins[name] = getConfig(name, pkg)
     } else if (!(name in presets) && PRESETS_RE.test(name)) {
-      presets[name] = {}
+      presets[name] = getConfig(name, pkg)
     }
   })
 

@xen-orchestra/cron/package.json

@@ -41,10 +41,10 @@
     "moment-timezone": "^0.5.14"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"
   },

@xen-orchestra/fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/fs",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "AGPL-3.0",
   "description": "The File System for Xen Orchestra backups.",
   "keywords": [],
@@ -20,10 +20,10 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.44",
+    "@babel/runtime": "^7.0.0-beta.49",
     "@marsaud/smb2-promise": "^0.2.1",
     "execa": "^0.10.0",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^6.0.1",
     "get-stream": "^3.0.0",
     "lodash": "^4.17.4",
     "promise-toolbox": "^0.9.5",
@@ -32,12 +32,12 @@
     "xo-remote-parser": "^0.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/plugin-proposal-function-bind": "7.0.0-beta.44",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/plugin-proposal-function-bind": "7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "index-modules": "^0.3.0",

@xen-orchestra/fs/src/abstract.js

@@ -126,7 +126,10 @@ export default class RemoteHandlerAbstract {
       prependDir = false,
     }: { filter?: (name: string) => boolean, prependDir?: boolean } = {}
   ): Promise<string[]> {
-    const entries = await this._list(dir)
+    let entries = await this._list(dir)
+    if (filter !== undefined) {
+      entries = entries.filter(filter)
+    }
 
     if (prependDir) {
       entries.forEach((entry, i) => {
@@ -134,7 +137,7 @@ export default class RemoteHandlerAbstract {
       })
     }
 
-    return filter === undefined ? entries : entries.filter(filter)
+    return entries
   }
 
   async _list (dir: string): Promise<string[]> {

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+### Check list
+
+- [ ] if UI changes, a screenshot has been added to the PR
+- [ ] CHANGELOG updated
+- [ ] documentation updated
+
+### Process
+
+1. create a PR as soon as possible
+1. mark it as `WiP:` (Work in Progress) if not ready to be merged
+1. when you want a review, add a reviewer
+1. if necessary, update your PR, and readd a reviewer
+
+### List of packages to release
+
+> No need to mention xo-server and xo-web.

babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  // Necessary for jest to be able to find the `.babelrc.js` closest to the file
+  // instead of only the one in this directory.
+  babelrcRoots: true,
+}

flow-typed/limit-concurrency-decorator.js

@@ -0,0 +1,6 @@
+declare module 'limit-concurrency-decorator' {
+  declare function limitConcurrencyDecorator(
+    concurrency: number
+  ): <T: Function>(T) => T
+  declare export default typeof limitConcurrencyDecorator
+}

package.json

@@ -1,8 +1,10 @@
 {
   "devDependencies": {
-    "@babel/register": "^7.0.0-beta.44",
-    "babel-7-jest": "^21.3.2",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/register": "^7.0.0-beta.49",
+    "babel-core": "^7.0.0-0",
     "babel-eslint": "^8.1.2",
+    "babel-jest": "^23.0.1",
     "benchmark": "^2.1.4",
     "eslint": "^4.14.0",
     "eslint-config-standard": "^11.0.0-beta.0",
@@ -13,23 +15,22 @@
     "eslint-plugin-react": "^7.6.1",
     "eslint-plugin-standard": "^3.0.1",
     "exec-promise": "^0.7.0",
-    "flow-bin": "^0.69.0",
+    "flow-bin": "^0.73.0",
     "globby": "^8.0.0",
     "husky": "^0.14.3",
-    "jest": "^22.0.4",
+    "jest": "^23.0.1",
     "lodash": "^4.17.4",
     "prettier": "^1.10.2",
     "promise-toolbox": "^0.9.5",
     "sorted-object": "^2.0.1"
   },
   "engines": {
-    "yarn": "^1.2.1"
+    "yarn": "^1.7.0"
   },
   "jest": {
     "collectCoverage": true,
     "projects": [
-      "<rootDir>",
-      "<rootDir>/packages/xo-web"
+      "<rootDir>"
     ],
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
@@ -38,14 +39,6 @@
     ],
     "testRegex": "\\.spec\\.js$",
     "transform": {
-      "/@xen-orchestra/cron/.+\\.jsx?$": "babel-7-jest",
-      "/@xen-orchestra/fs/.+\\.jsx?$": "babel-7-jest",
-      "/packages/complex-matcher/.+\\.jsx?$": "babel-7-jest",
-      "/packages/value-matcher/.+\\.jsx?$": "babel-7-jest",
-      "/packages/vhd-lib/.+\\.jsx?$": "babel-7-jest",
-      "/packages/xo-cli/.+\\.jsx?$": "babel-7-jest",
-      "/packages/xo-server/.+\\.jsx?$": "babel-7-jest",
-      "/packages/xo-vmdk-to-vhd/.+\\.jsx?$": "babel-7-jest",
       "\\.jsx?$": "babel-jest"
     }
   },

packages/complex-matcher/package.json

@@ -30,9 +30,9 @@
     "lodash": "^4.17.4"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.1",
     "rimraf": "^2.6.2"

packages/value-matcher/package.json

@@ -28,10 +28,10 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"
   },

packages/vhd-cli/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

packages/vhd-cli/package.json

@@ -23,21 +23,20 @@
     "dist/"
   ],
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/fs": "^0.0.0",
-    "babel-runtime": "^6.22.0",
+    "@xen-orchestra/fs": "^0.0.1",
     "exec-promise": "^0.7.0",
     "struct-fu": "^1.2.0",
     "vhd-lib": "^0.1.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
+    "@babel/cli": "^7.0.0-beta.49",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "^7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-stage-3": "^6.24.1",
     "cross-env": "^5.1.3",
     "execa": "^0.10.0",
     "index-modules": "^0.3.0",
@@ -51,22 +50,5 @@
     "prebuild": "rimraf dist/ && index-modules --cjs-lazy src/commands",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build"
-  },
-  "babel": {
-    "plugins": [
-      "lodash",
-      "transform-runtime"
-    ],
-    "presets": [
-      [
-        "env",
-        {
-          "targets": {
-            "node": 4
-          }
-        }
-      ],
-      "stage-3"
-    ]
   }
 }

packages/vhd-lib/package.json

@@ -20,30 +20,30 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.44",
-    "@xen-orchestra/fs": "^0.0.0",
+    "@babel/runtime": "^7.0.0-beta.49",
     "async-iterator-to-stream": "^1.0.2",
-    "execa": "^0.10.0",
     "from2": "^2.3.0",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^6.0.1",
     "get-stream": "^3.0.0",
     "limit-concurrency-decorator": "^0.4.0",
     "promise-toolbox": "^0.9.5",
     "struct-fu": "^1.2.0",
-    "uuid": "^3.0.1",
-    "tmp": "^0.0.33"
+    "uuid": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
+    "@xen-orchestra/fs": "^0.0.1",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
+    "execa": "^0.10.0",
     "fs-promise": "^2.0.0",
     "index-modules": "^0.3.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^2.6.2",
+    "tmp": "^0.0.33"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/vhd-lib/src/vhd.js

@@ -476,12 +476,12 @@ export default class Vhd {
 
     // For each sector of block data...
     const { sectorsPerBlock } = child
+    let parentBitmap = null
     for (let i = 0; i < sectorsPerBlock; i++) {
       // If no changes on one sector, skip.
       if (!mapTestBit(bitmap, i)) {
         continue
       }
-      let parentBitmap = null
       let endSector = i + 1
 
       // Count changed sectors.

packages/xo-acl-resolver/src/index.js

@@ -50,7 +50,9 @@ const checkAuthorizationByTypes = {
 
   network: or(checkSelf, checkMember('$pool')),
 
-  SR: or(checkSelf, checkMember('$pool')),
+  PIF: checkMember('$host'),
+
+  SR: or(checkSelf, checkMember('$container')),
 
   task: checkMember('$host'),
 

packages/xo-cli/package.json

@@ -28,7 +28,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/polyfill": "7.0.0-beta.44",
+    "@babel/polyfill": "7.0.0-beta.49",
     "bluebird": "^3.5.1",
     "chalk": "^2.2.0",
     "event-to-promise": "^0.8.0",
@@ -49,10 +49,10 @@
     "xo-lib": "^0.9.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"

packages/xo-collection/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

packages/xo-collection/package.json

@@ -25,17 +25,16 @@
     "node": ">=4"
   },
   "dependencies": {
-    "babel-runtime": "^6.18.0",
+    "@babel/runtime": "^7.0.0-beta.49",
     "kindof": "^2.0.0",
     "lodash": "^4.17.2",
     "make-error": "^1.0.2"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-plugin-lodash": "^3.3.2",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-stage-3": "^6.24.1",
+    "@babel/cli": "^7.0.0-beta.49",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "^7.0.0-beta.49",
     "cross-env": "^5.1.3",
     "event-to-promise": "^0.8.0",
     "rimraf": "^2.6.1"
@@ -46,22 +45,5 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
-  },
-  "babel": {
-    "plugins": [
-      "lodash",
-      "transform-runtime"
-    ],
-    "presets": [
-      [
-        "env",
-        {
-          "targets": {
-            "node": 4
-          }
-        }
-      ],
-      "stage-3"
-    ]
   }
 }

packages/xo-remote-parser/.babelrc.js

@@ -0,0 +1,3 @@
+module.exports = require('../../@xen-orchestra/babel-config')(
+  require('./package.json')
+)

packages/xo-remote-parser/package.json

@@ -27,10 +27,10 @@
     "lodash": "^4.13.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
+    "@babel/cli": "^7.0.0-beta.49",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/preset-env": "^7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-stage-3": "^6.24.1",
     "cross-env": "^5.1.3",
     "deep-freeze": "^0.0.1",
     "rimraf": "^2.6.1"
@@ -41,22 +41,5 @@
     "prebuild": "rimraf dist/",
     "predev": "yarn run prebuild",
     "prepare": "yarn run build"
-  },
-  "babel": {
-    "plugins": [
-      "lodash"
-    ],
-    "presets": [
-      [
-        "env",
-        {
-          "targets": {
-            "browsers": "> 5%",
-            "node": 4
-          }
-        }
-      ],
-      "stage-3"
-    ]
   }
 }

packages/xo-server-backup-reports/src/index.js

@@ -1,7 +1,6 @@
 import humanFormat from 'human-format'
 import moment from 'moment-timezone'
-import { find, forEach, get, startCase } from 'lodash'
-
+import { forEach, get, startCase } from 'lodash'
 import pkg from '../package'
 
 export const configurationSchema = {
@@ -37,6 +36,12 @@ const ICON_FAILURE = '🚨'
 const ICON_SKIPPED = '⏩'
 const ICON_SUCCESS = '✔'
 
+const STATUS_ICON = {
+  skipped: ICON_SKIPPED,
+  success: ICON_SUCCESS,
+  failure: ICON_FAILURE,
+}
+
 const DATE_FORMAT = 'dddd, MMMM Do YYYY, h:mm:ss a'
 const createDateFormater = timezone =>
   timezone !== undefined
@@ -95,43 +100,41 @@ class BackupReportsXoPlugin {
     this._xo.removeListener('job:terminated', this._report)
   }
 
-  _wrapper (status, job, schedule) {
+  _wrapper (status, job, schedule, runJobId) {
     return new Promise(resolve =>
       resolve(
         job.type === 'backup'
-          ? this._backupNgListener(status, job, schedule)
-          : this._listener(status, job, schedule)
+          ? this._backupNgListener(status, job, schedule, runJobId)
+          : this._listener(status, job, schedule, runJobId)
       )
     ).catch(logError)
   }
 
-  async _backupNgListener (runJobId, _, { timezone }) {
+  async _backupNgListener (_1, _2, { timezone }, runJobId) {
     const xo = this._xo
-    const logs = await xo.getBackupNgLogs(runJobId)
-    const jobLog = logs['roots'][0]
-    const vmsTaskLog = logs[jobLog.id]
+    const log = await xo.getBackupNgLogs(runJobId)
 
-    const { reportWhen, mode } = jobLog.data || {}
+    const { reportWhen, mode } = log.data || {}
     if (reportWhen === 'never') {
       return
     }
 
     const formatDate = createDateFormater(timezone)
-    const jobName = (await xo.getJob(jobLog.jobId, 'backup')).name
 
-    if (jobLog.error !== undefined) {
-      const [globalStatus, icon] =
-        jobLog.error.message === NO_VMS_MATCH_THIS_PATTERN
-          ? ['Skipped', ICON_SKIPPED]
-          : ['Failure', ICON_FAILURE]
+    if (log.status === 'success' && reportWhen === 'failure') {
+      return
+    }
+
+    const jobName = (await xo.getJob(log.jobId, 'backup')).name
+    if (log.result !== undefined) {
       let markdown = [
-        `##  Global status: ${globalStatus}`,
+        `##  Global status: ${log.status}`,
         '',
         `- **mode**: ${mode}`,
-        `- **Start time**: ${formatDate(jobLog.start)}`,
-        `- **End time**: ${formatDate(jobLog.end)}`,
-        `- **Duration**: ${formatDuration(jobLog.duration)}`,
-        `- **Error**: ${jobLog.error.message}`,
+        `- **Start time**: ${formatDate(log.start)}`,
+        `- **End time**: ${formatDate(log.end)}`,
+        `- **Duration**: ${formatDuration(log.end - log.start)}`,
+        `- **Error**: ${log.result.message}`,
         '---',
         '',
         `*${pkg.name} v${pkg.version}*`,
@@ -139,12 +142,14 @@ class BackupReportsXoPlugin {
 
       markdown = markdown.join('\n')
       return this._sendReport({
-        subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${jobName} ${icon}`,
+        subject: `[Xen Orchestra] ${
+          log.status
+        } − Backup report for ${jobName} ${STATUS_ICON[log.status]}`,
         markdown,
         nagiosStatus: 2,
-        nagiosMarkdown: `[Xen Orchestra] [${globalStatus}] Backup report for ${jobName} - Error : ${
-          jobLog.error.message
-        }`,
+        nagiosMarkdown: `[Xen Orchestra] [${
+          log.status
+        }] Backup report for ${jobName} - Error : ${log.result.message}`,
       })
     }
 
@@ -157,14 +162,12 @@ class BackupReportsXoPlugin {
     let globalTransferSize = 0
     let nFailures = 0
     let nSkipped = 0
-
-    for (const vmTaskLog of vmsTaskLog || []) {
-      const vmTaskStatus = vmTaskLog.status
-      if (vmTaskStatus === 'success' && reportWhen === 'failure') {
+    for (const taskLog of log.tasks) {
+      if (taskLog.status === 'success' && reportWhen === 'failure') {
         return
       }
 
-      const vmId = vmTaskLog.data.id
+      const vmId = taskLog.data.id
       let vm
       try {
         vm = xo.getObject(vmId)
@@ -173,132 +176,143 @@ class BackupReportsXoPlugin {
         `### ${vm !== undefined ? vm.name_label : 'VM not found'}`,
         '',
         `- **UUID**: ${vm !== undefined ? vm.uuid : vmId}`,
-        `- **Start time**: ${formatDate(vmTaskLog.start)}`,
-        `- **End time**: ${formatDate(vmTaskLog.end)}`,
-        `- **Duration**: ${formatDuration(vmTaskLog.duration)}`,
+        `- **Start time**: ${formatDate(taskLog.start)}`,
+        `- **End time**: ${formatDate(taskLog.end)}`,
+        `- **Duration**: ${formatDuration(taskLog.end - taskLog.start)}`,
       ]
 
       const failedSubTasks = []
-      const operationsText = []
+      const snapshotText = []
       const srsText = []
       const remotesText = []
-      for (const subTaskLog of logs[vmTaskLog.taskId] || []) {
-        const { data, status, result, message } = subTaskLog
-        const icon =
-          subTaskLog.status === 'success' ? ICON_SUCCESS : ICON_FAILURE
-        const errorMessage = `  **Error**: ${get(result, 'message')}`
 
-        if (message === 'snapshot') {
-          operationsText.push(`- **Snapshot** ${icon}`)
-          if (status === 'failure') {
-            failedSubTasks.push('Snapshot')
-            operationsText.push('', errorMessage)
-          }
-        } else if (data.type === 'remote') {
-          const remoteId = data.id
-          const remote = await xo.getRemote(remoteId).catch(() => {})
-          remotesText.push(
-            `- **${
-              remote !== undefined ? remote.name : `Remote Not found`
-            }** (${remoteId}) ${icon}`
+      for (const subTaskLog of taskLog.tasks || []) {
+        const icon = STATUS_ICON[subTaskLog.status]
+        const errorMessage = `    - **Error**: ${get(
+          subTaskLog.result,
+          'message'
+        )}`
+
+        if (subTaskLog.message === 'snapshot') {
+          snapshotText.push(
+            `- **Snapshot** ${icon}`,
+            `  - **Start time**: ${formatDate(subTaskLog.start)}`,
+            `  - **End time**: ${formatDate(subTaskLog.end)}`
           )
-          if (status === 'failure') {
-            failedSubTasks.push(remote !== undefined ? remote.name : remoteId)
+        } else if (subTaskLog.data.type === 'remote') {
+          const id = subTaskLog.data.id
+          const remote = await xo.getRemote(id).catch(() => {})
+          remotesText.push(
+            `  - **${
+              remote !== undefined ? remote.name : `Remote Not found`
+            }** (${id}) ${icon}`,
+            `    - **Start time**: ${formatDate(subTaskLog.start)}`,
+            `    - **End time**: ${formatDate(subTaskLog.end)}`,
+            `    - **Duration**: ${formatDuration(
+              subTaskLog.end - subTaskLog.start
+            )}`
+          )
+          if (subTaskLog.status === 'failure') {
+            failedSubTasks.push(remote !== undefined ? remote.name : id)
             remotesText.push('', errorMessage)
           }
         } else {
-          const srId = data.id
+          const id = subTaskLog.data.id
           let sr
           try {
-            sr = xo.getObject(srId)
+            sr = xo.getObject(id)
           } catch (e) {}
           const [srName, srUuid] =
-            sr !== undefined ? [sr.name_label, sr.uuid] : [`SR Not found`, srId]
-          srsText.push(`- **${srName}** (${srUuid}) ${icon}`)
-          if (status === 'failure') {
-            failedSubTasks.push(sr !== undefined ? sr.name_label : srId)
+            sr !== undefined ? [sr.name_label, sr.uuid] : [`SR Not found`, id]
+          srsText.push(
+            `  - **${srName}** (${srUuid}) ${icon}`,
+            `    - **Start time**: ${formatDate(subTaskLog.start)}`,
+            `    - **End time**: ${formatDate(subTaskLog.end)}`,
+            `    - **Duration**: ${formatDuration(
+              subTaskLog.end - subTaskLog.start
+            )}`
+          )
+          if (subTaskLog.status === 'failure') {
+            failedSubTasks.push(sr !== undefined ? sr.name_label : id)
             srsText.push('', errorMessage)
           }
         }
+
+        forEach(subTaskLog.tasks, operationLog => {
+          const size = operationLog.result.size
+          if (operationLog.message === 'merge') {
+            globalMergeSize += size
+          } else {
+            globalTransferSize += size
+          }
+          const operationText = [
+            `    - **${operationLog.message}** ${
+              STATUS_ICON[operationLog.status]
+            }`,
+            `      - **Start time**: ${formatDate(operationLog.start)}`,
+            `      - **End time**: ${formatDate(operationLog.end)}`,
+            `      - **Duration**: ${formatDuration(
+              operationLog.end - operationLog.start
+            )}`,
+            operationLog.status === 'failure'
+              ? `- **Error**: ${get(operationLog.result, 'message')}`
+              : `      - **Size**: ${formatSize(size)}`,
+            `      - **Speed**: ${formatSpeed(
+              size,
+              operationLog.end - operationLog.start
+            )}`,
+          ].join('\n')
+          if (get(subTaskLog, 'data.type') === 'remote') {
+            remotesText.push(operationText)
+            remotesText.join('\n')
+          }
+          if (get(subTaskLog, 'data.type') === 'SR') {
+            srsText.push(operationText)
+            srsText.join('\n')
+          }
+        })
       }
 
-      if (operationsText.length !== 0) {
-        operationsText.unshift(`#### Operations`, '')
-      }
       if (srsText.length !== 0) {
-        srsText.unshift(`#### SRs`, '')
+        srsText.unshift(`- **SRs**`)
       }
       if (remotesText.length !== 0) {
-        remotesText.unshift(`#### remotes`, '')
+        remotesText.unshift(`- **Remotes**`)
       }
-      const subText = [...operationsText, '', ...srsText, '', ...remotesText]
-      const result = vmTaskLog.result
-      if (vmTaskStatus === 'failure' && result !== undefined) {
-        const { message } = result
-        if (isSkippedError(result)) {
+      const subText = [...snapshotText, '', ...srsText, '', ...remotesText]
+      if (taskLog.result !== undefined) {
+        if (taskLog.status === 'skipped') {
           ++nSkipped
           skippedVmsText.push(
             ...text,
             `- **Reason**: ${
-              message === UNHEALTHY_VDI_CHAIN_ERROR
+              taskLog.result.message === UNHEALTHY_VDI_CHAIN_ERROR
                 ? UNHEALTHY_VDI_CHAIN_MESSAGE
-                : message
+                : taskLog.result.message
             }`,
             ''
           )
           nagiosText.push(
-            `[(Skipped) ${
-              vm !== undefined ? vm.name_label : 'undefined'
-            } : ${message} ]`
+            `[(Skipped) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
+              taskLog.result.message
+            } ]`
           )
         } else {
           ++nFailures
-          failedVmsText.push(...text, `- **Error**: ${message}`, '')
+          failedVmsText.push(
+            ...text,
+            `- **Error**: ${taskLog.result.message}`,
+            ''
+          )
 
           nagiosText.push(
-            `[(Failed) ${
-              vm !== undefined ? vm.name_label : 'undefined'
-            } : ${message} ]`
+            `[(Failed) ${vm !== undefined ? vm.name_label : 'undefined'} : ${
+              taskLog.result.message
+            } ]`
           )
         }
       } else {
-        let transferSize, transferDuration, mergeSize, mergeDuration
-
-        forEach(logs[vmTaskLog.taskId], ({ taskId }) => {
-          if (transferSize !== undefined) {
-            return false
-          }
-
-          const transferTask = find(logs[taskId], { message: 'transfer' })
-          if (transferTask !== undefined) {
-            transferSize = transferTask.result.size
-            transferDuration = transferTask.end - transferTask.start
-          }
-
-          const mergeTask = find(logs[taskId], { message: 'merge' })
-          if (mergeTask !== undefined) {
-            mergeSize = mergeTask.result.size
-            mergeDuration = mergeTask.end - mergeTask.start
-          }
-        })
-        if (transferSize !== undefined) {
-          globalTransferSize += transferSize
-          text.push(
-            `- **Transfer size**: ${formatSize(transferSize)}`,
-            `- **Transfer speed**: ${formatSpeed(
-              transferSize,
-              transferDuration
-            )}`
-          )
-        }
-        if (mergeSize !== undefined) {
-          globalMergeSize += mergeSize
-          text.push(
-            `- **Merge size**: ${formatSize(mergeSize)}`,
-            `- **Merge speed**: ${formatSpeed(mergeSize, mergeDuration)}`
-          )
-        }
-        if (vmTaskStatus === 'failure') {
+        if (taskLog.status === 'failure') {
           ++nFailures
           failedVmsText.push(...text, '', '', ...subText, '')
           nagiosText.push(
@@ -311,23 +325,16 @@ class BackupReportsXoPlugin {
         }
       }
     }
-    const globalSuccess = nFailures === 0 && nSkipped === 0
-    if (reportWhen === 'failure' && globalSuccess) {
-      return
-    }
 
-    const nVms = vmsTaskLog.length
+    const nVms = log.tasks.length
     const nSuccesses = nVms - nFailures - nSkipped
-    const globalStatus = globalSuccess
-      ? `Success`
-      : nFailures !== 0 ? `Failure` : `Skipped`
     let markdown = [
-      `##  Global status: ${globalStatus}`,
+      `##  Global status: ${log.status}`,
       '',
       `- **mode**: ${mode}`,
-      `- **Start time**: ${formatDate(jobLog.start)}`,
-      `- **End time**: ${formatDate(jobLog.end)}`,
-      `- **Duration**: ${formatDuration(jobLog.duration)}`,
+      `- **Start time**: ${formatDate(log.start)}`,
+      `- **End time**: ${formatDate(log.end)}`,
+      `- **Duration**: ${formatDuration(log.start - log.end)}`,
       `- **Successes**: ${nSuccesses} / ${nVms}`,
     ]
 
@@ -367,17 +374,16 @@ class BackupReportsXoPlugin {
     markdown = markdown.join('\n')
     return this._sendReport({
       markdown,
-      subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${jobName} ${
-        globalSuccess
-          ? ICON_SUCCESS
-          : nFailures !== 0 ? ICON_FAILURE : ICON_SKIPPED
+      subject: `[Xen Orchestra] ${log.status} − Backup report for ${jobName} ${
+        STATUS_ICON[log.status]
       }`,
-      nagiosStatus: globalSuccess ? 0 : 2,
-      nagiosMarkdown: globalSuccess
-        ? `[Xen Orchestra] [Success] Backup report for ${jobName}`
-        : `[Xen Orchestra] [${
-            nFailures !== 0 ? 'Failure' : 'Skipped'
-          }] Backup report for ${jobName} - VMs : ${nagiosText.join(' ')}`,
+      nagiosStatus: log.status === 'success' ? 0 : 2,
+      nagiosMarkdown:
+        log.status === 'success'
+          ? `[Xen Orchestra] [Success] Backup report for ${jobName}`
+          : `[Xen Orchestra] [${
+              nFailures !== 0 ? 'Failure' : 'Skipped'
+            }] Backup report for ${jobName} - VMs : ${nagiosText.join(' ')}`,
     })
   }
 
@@ -567,7 +573,9 @@ class BackupReportsXoPlugin {
     const nSuccesses = nCalls - nFailures - nSkipped
     const globalStatus = globalSuccess
       ? `Success`
-      : nFailures !== 0 ? `Failure` : `Skipped`
+      : nFailures !== 0
+        ? `Failure`
+        : `Skipped`
 
     let markdown = [
       `##  Global status: ${globalStatus}`,
@@ -625,7 +633,9 @@ class BackupReportsXoPlugin {
       subject: `[Xen Orchestra] ${globalStatus} − Backup report for ${tag} ${
         globalSuccess
           ? ICON_SUCCESS
-          : nFailures !== 0 ? ICON_FAILURE : ICON_SKIPPED
+          : nFailures !== 0
+            ? ICON_FAILURE
+            : ICON_SKIPPED
       }`,
       nagiosStatus: globalSuccess ? 0 : 2,
       nagiosMarkdown: globalSuccess

packages/xo-server-perf-alert/package.json

@@ -26,10 +26,10 @@
     "lodash": "^4.17.4"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "^7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "^7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "rimraf": "^2.6.2"

packages/xo-server-usage-report/src/index.js

@@ -139,8 +139,8 @@ Handlebars.registerHelper(
     new Handlebars.SafeString(
       isFinite(+value) && +value !== 0
         ? (value = round(value, 2)) > 0
-          ? `(<b style="color: green;">▲ ${value}</b>)`
-          : `(<b style="color: red;">▼ ${String(value).slice(1)}</b>)`
+          ? `(<b style="color: green;">▲ ${value}%</b>)`
+          : `(<b style="color: red;">▼ ${String(value).slice(1)}%</b>)`
         : ''
     )
 )
@@ -270,12 +270,16 @@ async function getHostsStats ({ runningHosts, xo }) {
 
 function getSrsStats (xoObjects) {
   return orderBy(
-    map(filter(xoObjects, { type: 'SR' }), sr => {
+    map(filter(xoObjects, obj => obj.type === 'SR' && obj.size > 0), sr => {
       const total = sr.size / gibPower
       const used = sr.physical_usage / gibPower
+      let name = sr.name_label
+      if (!sr.shared) {
+        name += ` (${find(xoObjects, { id: sr.$container }).name_label})`
+      }
       return {
         uuid: sr.uuid,
-        name: sr.name_label,
+        name,
         total,
         used,
         free: total - used,

packages/xo-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.19.7",
+  "version": "5.19.9",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [
@@ -31,15 +31,15 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@babel/polyfill": "7.0.0-beta.44",
+    "@babel/polyfill": "7.0.0-beta.49",
     "@marsaud/smb2-promise": "^0.2.1",
     "@xen-orchestra/cron": "^1.0.3",
-    "@xen-orchestra/fs": "^0.0.0",
+    "@xen-orchestra/fs": "^0.0.1",
     "ajv": "^6.1.1",
     "app-conf": "^0.5.0",
     "archiver": "^2.1.0",
     "async-iterator-to-stream": "^1.0.1",
-    "base64url": "^2.0.0",
+    "base64url": "^3.0.0",
     "bind-property-descriptor": "^1.0.0",
     "blocked": "^1.2.1",
     "bluebird": "^3.5.1",
@@ -59,10 +59,10 @@
     "express-session": "^1.15.6",
     "fatfs": "^0.10.4",
     "from2": "^2.3.0",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^6.0.1",
     "get-stream": "^3.0.0",
     "golike-defer": "^0.4.1",
-    "hashy": "^0.6.2",
+    "hashy": "^0.7.1",
     "helmet": "^3.9.0",
     "highland": "^2.11.1",
     "http-proxy": "^1.16.2",
@@ -70,14 +70,14 @@
     "http-server-plus": "^0.10.0",
     "human-format": "^0.10.0",
     "is-redirect": "^1.0.0",
-    "jest-worker": "^22.4.3",
+    "jest-worker": "^23.0.0",
     "js-yaml": "^3.10.0",
     "json-rpc-peer": "^0.15.3",
     "json5": "^1.0.0",
     "julien-f-source-map-support": "0.1.0",
     "julien-f-unzip": "^0.2.1",
     "kindof": "^2.0.0",
-    "level": "^3.0.0",
+    "level": "^4.0.0",
     "level-party": "^3.0.4",
     "level-sublevel": "^6.6.1",
     "limit-concurrency-decorator": "^0.4.0",
@@ -93,16 +93,16 @@
     "partial-stream": "0.0.0",
     "passport": "^0.4.0",
     "passport-local": "^1.0.0",
-    "pretty-format": "^22.0.3",
+    "pretty-format": "^23.0.0",
     "promise-toolbox": "^0.9.5",
-    "proxy-agent": "^2.1.0",
+    "proxy-agent": "^3.0.0",
     "pug": "^2.0.0-rc.4",
     "pw": "^0.0.4",
     "redis": "^2.8.0",
     "schema-inspector": "^1.6.8",
     "semver": "^5.4.1",
     "serve-static": "^1.13.1",
-    "split-lines": "^1.1.0",
+    "split-lines": "^2.0.0",
     "stack-chain": "^2.0.0",
     "stoppable": "^1.0.5",
     "struct-fu": "^1.2.0",
@@ -119,21 +119,21 @@
     "xo-collection": "^0.4.1",
     "xo-common": "^0.1.1",
     "xo-remote-parser": "^0.3",
-    "xo-vmdk-to-vhd": "^0.1.1",
+    "xo-vmdk-to-vhd": "^0.1.2",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/plugin-proposal-decorators": "7.0.0-beta.44",
-    "@babel/plugin-proposal-export-default-from": "7.0.0-beta.44",
-    "@babel/plugin-proposal-export-namespace-from": "7.0.0-beta.44",
-    "@babel/plugin-proposal-function-bind": "7.0.0-beta.44",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0-beta.44",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0-beta.44",
-    "@babel/plugin-proposal-throw-expressions": "^7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/preset-flow": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/plugin-proposal-decorators": "7.0.0-beta.49",
+    "@babel/plugin-proposal-export-default-from": "7.0.0-beta.49",
+    "@babel/plugin-proposal-export-namespace-from": "7.0.0-beta.49",
+    "@babel/plugin-proposal-function-bind": "7.0.0-beta.49",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-pipeline-operator": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
+    "@babel/preset-flow": "7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "index-modules": "^0.3.0",

packages/xo-server/src/api/backup-ng.js

@@ -1,4 +1,5 @@
 import { basename } from 'path'
+import { isEmpty, pickBy } from 'lodash'
 
 import { safeDateFormat } from '../utils'
 
@@ -117,8 +118,8 @@ getJob.params = {
   },
 }
 
-export async function runJob ({ id, schedule }) {
-  return this.runJobSequence([id], await this.getSchedule(schedule))
+export async function runJob ({ id, schedule, vm }) {
+  return this.runJobSequence([id], await this.getSchedule(schedule), vm)
 }
 
 runJob.permission = 'admin'
@@ -130,12 +131,17 @@ runJob.params = {
   schedule: {
     type: 'string',
   },
+  vm: {
+    type: 'string',
+    optional: true,
+  },
 }
 
 // -----------------------------------------------------------------------------
 
-export function getAllLogs () {
-  return this.getBackupNgLogs()
+export async function getAllLogs (filter) {
+  const logs = await this.getBackupNgLogs()
+  return isEmpty(filter) ? logs : pickBy(logs, filter)
 }
 
 getAllLogs.permission = 'admin'

packages/xo-server/src/api/host.js

@@ -76,6 +76,21 @@ export { restartAgent as restart_agent } // eslint-disable-line camelcase
 
 // -------------------------------------------------------------------
 
+export function setRemoteSyslogHost ({ host, syslogDestination }) {
+  return this.getXapi(host).setRemoteSyslogHost(host._xapiId, syslogDestination)
+}
+
+setRemoteSyslogHost.params = {
+  id: { type: 'string' },
+  syslogDestination: { type: 'string' },
+}
+
+setRemoteSyslogHost.resolve = {
+  host: ['id', 'host', 'administrate'],
+}
+
+// -------------------------------------------------------------------
+
 export function start ({ host }) {
   return this.getXapi(host).powerOnHost(host._xapiId)
 }

packages/xo-server/src/api/vm.js

@@ -50,11 +50,16 @@ const extract = (obj, prop) => {
 export async function create (params) {
   const { user } = this
   const resourceSet = extract(params, 'resourceSet')
-  if (resourceSet === undefined && user.permission !== 'admin') {
+  const template = extract(params, 'template')
+  if (
+    resourceSet === undefined &&
+    !(await this.hasPermissions(this.user.id, [
+      [template.$pool, 'administrate'],
+    ]))
+  ) {
     throw unauthorized()
   }
 
-  const template = extract(params, 'template')
   params.template = template._xapiId
 
   const xapi = this.getXapi(template)
@@ -467,7 +472,7 @@ export async function migrate ({
     })
   }
 
-  if (!await this.hasPermissions(this.session.get('user_id'), permissions)) {
+  if (!(await this.hasPermissions(this.session.get('user_id'), permissions))) {
     throw unauthorized()
   }
 
@@ -707,9 +712,9 @@ copy.resolve = {
 export async function convertToTemplate ({ vm }) {
   // Convert to a template requires pool admin permission.
   if (
-    !await this.hasPermissions(this.session.get('user_id'), [
+    !(await this.hasPermissions(this.session.get('user_id'), [
       [vm.$pool, 'administrate'],
-    ])
+    ]))
   ) {
     throw unauthorized()
   }
@@ -1269,7 +1274,9 @@ export async function createInterface ({
     await this.checkResourceSetConstraints(resourceSet, this.user.id, [
       network.id,
     ])
-  } else if (!await this.hasPermissions(this.user.id, [[network.id, 'view']])) {
+  } else if (
+    !(await this.hasPermissions(this.user.id, [[network.id, 'view']]))
+  ) {
     throw unauthorized()
   }
 

packages/xo-server/src/index.js

@@ -507,7 +507,7 @@ const setUpConsoleProxy = (webServer, xo) => {
         const { token } = parseCookies(req.headers.cookie)
 
         const user = await xo.authenticateUser({ token })
-        if (!await xo.hasPermissions(user.id, [[id, 'operate']])) {
+        if (!(await xo.hasPermissions(user.id, [[id, 'operate']]))) {
           throw invalidCredentials()
         }
 
@@ -551,7 +551,7 @@ export default async function main (args) {
         debug('blocked for %sms', ms | 0)
       },
       {
-        threshold: 50,
+        threshold: 500,
       }
     )
   }

packages/xo-server/src/schemas/log/jobStart.js

@@ -13,6 +13,10 @@ export default {
       type: 'string',
       description: 'identifier of this job',
     },
+    scheduleId: {
+      type: 'string',
+      description: 'identifier of the schedule which ran the job',
+    },
     key: {
       type: 'string',
     },

packages/xo-server/src/xapi-object-to-xo.js

@@ -146,6 +146,7 @@ const TRANSFORMS = {
       license_params: obj.license_params,
       license_server: obj.license_server,
       license_expiry: toTimestamp(obj.license_params.expiry),
+      logging: obj.logging,
       name_description: obj.name_description,
       name_label: obj.name_label,
       memory: (function () {
@@ -186,9 +187,14 @@ const TRANSFORMS = {
           }
         }),
       agentStartTime: toTimestamp(otherConfig.agent_start_time),
-      rebootRequired: !isEmpty(obj.updates_requiring_reboot),
+      rebootRequired:
+        softwareVersion.product_brand === 'XCP-ng'
+          ? toTimestamp(otherConfig.boot_time) <
+            +otherConfig.rpm_patch_installation_time
+          : !isEmpty(obj.updates_requiring_reboot),
       tags: obj.tags,
       version: softwareVersion.product_version,
+      productBrand: softwareVersion.product_brand,
 
       // TODO: dedupe.
       PIFs: link(obj, 'PIFs'),
@@ -227,12 +233,16 @@ const TRANSFORMS = {
         return
       }
 
-      if (!guestMetrics) {
+      if (guestMetrics === undefined) {
         return false
       }
 
       const { major, minor } = guestMetrics.PV_drivers_version
 
+      if (major === undefined || minor === undefined) {
+        return false
+      }
+
       return {
         major,
         minor,

packages/xo-server/src/xapi/index.js

@@ -426,6 +426,14 @@ export default class Xapi extends XapiBase {
     await this.call('host.restart_agent', this.getObject(hostId).$ref)
   }
 
+  async setRemoteSyslogHost (hostId, syslogDestination) {
+    const host = this.getObject(hostId)
+    await this.call('host.set_logging', host.$ref, {
+      syslog_destination: syslogDestination,
+    })
+    await this.call('host.syslog_reconfigure', host.$ref)
+  }
+
   async shutdownHost (hostId, force = false) {
     const host = this.getObject(hostId)
 
@@ -816,12 +824,14 @@ export default class Xapi extends XapiBase {
     } = {}
   ): Promise<DeltaVmExport> {
     let vm = this.getObject(vmId)
-    if (!bypassVdiChainsCheck) {
-      this._assertHealthyVdiChains(vm)
-    }
+
     // do not use the snapshot name in the delta export
     const exportedNameLabel = vm.name_label
     if (!vm.is_a_snapshot) {
+      if (!bypassVdiChainsCheck) {
+        this._assertHealthyVdiChains(vm)
+      }
+
       vm = await this._snapshotVm($cancelToken, vm, snapshotNameLabel)
       $defer.onFailure(() => this._deleteVm(vm))
     }
@@ -958,7 +968,9 @@ export default class Xapi extends XapiBase {
         )
 
         if (!baseVm) {
-          throw new Error('could not find the base VM')
+          throw new Error(
+            `could not find the base VM (copy of ${remoteBaseVmUuid})`
+          )
         }
       }
     }
@@ -1142,7 +1154,9 @@ export default class Xapi extends XapiBase {
         vdis[vdi.$ref] =
           mapVdisSrs && mapVdisSrs[vdi.$id]
             ? hostXapi.getObject(mapVdisSrs[vdi.$id]).$ref
-            : sr !== undefined ? hostXapi.getObject(sr).$ref : defaultSr.$ref // Will error if there are no default SR.
+            : sr !== undefined
+              ? hostXapi.getObject(sr).$ref
+              : defaultSr.$ref // Will error if there are no default SR.
       }
     }
 

packages/xo-server/src/xapi/mixins/patching.js

@@ -1,5 +1,6 @@
 import deferrable from 'golike-defer'
 import every from 'lodash/every'
+import filter from 'lodash/filter'
 import find from 'lodash/find'
 import includes from 'lodash/includes'
 import isObject from 'lodash/isObject'
@@ -11,6 +12,7 @@ import unzip from 'julien-f-unzip'
 
 import { debounce } from '../../decorators'
 import {
+  asyncMap,
   ensureArray,
   forEach,
   mapFilter,
@@ -149,9 +151,12 @@ export default {
   },
 
   async listMissingPoolPatchesOnHost (hostId) {
+    const host = this.getObject(hostId)
     // Returns an array to not break compatibility.
     return mapToArray(
-      await this._listMissingPoolPatchesOnHost(this.getObject(hostId))
+      await (host.software_version.product_brand === 'XCP-ng'
+        ? this._xcpListHostUpdates(host)
+        : this._listMissingPoolPatchesOnHost(host))
     )
   },
 
@@ -440,8 +445,14 @@ export default {
   },
 
   async installAllPoolPatchesOnHost (hostId) {
-    let host = this.getObject(hostId)
+    const host = this.getObject(hostId)
+    if (host.software_version.product_brand === 'XCP-ng') {
+      return this._xcpInstallHostUpdates(host)
+    }
+    return this._installAllPoolPatchesOnHost(host)
+  },
 
+  async _installAllPoolPatchesOnHost (host) {
     const installableByUuid =
       host.license_params.sku_type !== 'free'
         ? await this._listMissingPoolPatchesOnHost(host)
@@ -479,6 +490,13 @@ export default {
   },
 
   async installAllPoolPatchesOnAllHosts () {
+    if (this.pool.$master.software_version.product_brand === 'XCP-ng') {
+      return this._xcpInstallAllPoolUpdatesOnHost()
+    }
+    return this._installAllPoolPatchesOnAllHosts()
+  },
+
+  async _installAllPoolPatchesOnAllHosts () {
     const installableByUuid = assign(
       {},
       ...(await Promise.all(
@@ -518,4 +536,47 @@ export default {
       })
     }
   },
+
+  // ----------------------------------
+  // XCP-ng dedicated zone for patching
+  // ----------------------------------
+
+  // list all yum updates available for a XCP-ng host
+  async _xcpListHostUpdates (host) {
+    return JSON.parse(
+      await this.call(
+        'host.call_plugin',
+        host.$ref,
+        'updater.py',
+        'check_update',
+        {}
+      )
+    )
+  },
+
+  // install all yum updates for a XCP-ng host
+  async _xcpInstallHostUpdates (host) {
+    const update = await this.call(
+      'host.call_plugin',
+      host.$ref,
+      'updater.py',
+      'update',
+      {}
+    )
+
+    if (JSON.parse(update).exit !== 0) {
+      throw new Error('Update install failed')
+    } else {
+      await this._updateObjectMapProperty(host, 'other_config', {
+        rpm_patch_installation_time: String(Date.now() / 1000),
+      })
+    }
+  },
+
+  // install all yum updates for all XCP-ng hosts in a give pool
+  async _xcpInstallAllPoolUpdatesOnHost () {
+    await asyncMap(filter(this.objects.all, { $type: 'host' }), host =>
+      this._xcpInstallHostUpdates(host)
+    )
+  },
 }

packages/xo-server/src/xo-mixins/backups-ng-logs.js

@@ -0,0 +1,119 @@
+import { forEach } from 'lodash'
+
+const isSkippedError = error =>
+  error.message === 'no disks found' ||
+  error.message === 'no such object' ||
+  error.message === 'no VMs match this pattern' ||
+  error.message === 'unhealthy VDI chain'
+
+const getStatus = (
+  error,
+  status = error === undefined ? 'success' : 'failure'
+) => (status === 'failure' && isSkippedError(error) ? 'skipped' : status)
+
+const computeStatus = (status, tasks) => {
+  if (status === 'failure' || tasks === undefined) {
+    return status
+  }
+
+  for (let i = 0, n = tasks.length; i < n; ++i) {
+    const taskStatus = tasks[i].status
+    if (taskStatus === 'failure') {
+      return taskStatus
+    }
+    if (taskStatus === 'skipped') {
+      status = taskStatus
+    }
+  }
+
+  return status
+}
+
+export default {
+  async getBackupNgLogs (runId?: string) {
+    const { runningJobs } = this
+    const consolidated = {}
+    const started = {}
+    forEach(await this.getLogs('jobs'), ({ data, time, message }, id) => {
+      const { event } = data
+      if (event === 'job.start') {
+        if (
+          (data.type === 'backup' || data.key === undefined) &&
+          (runId === undefined || runId === id)
+        ) {
+          const { jobId } = data
+          consolidated[id] = started[id] = {
+            data: data.data,
+            id,
+            jobId,
+            start: time,
+            status: runningJobs[jobId] === id ? 'pending' : 'interrupted',
+          }
+        }
+      } else if (event === 'job.end') {
+        const { runJobId } = data
+        const log = started[runJobId]
+        if (log !== undefined) {
+          delete started[runJobId]
+          log.end = time
+          log.status = computeStatus(
+            getStatus((log.result = data.error)),
+            log.tasks
+          )
+        }
+      } else if (event === 'task.start') {
+        const parent = started[data.parentId]
+        if (parent !== undefined) {
+          ;(parent.tasks || (parent.tasks = [])).push(
+            (started[id] = {
+              data: data.data,
+              id,
+              message,
+              start: time,
+              status: parent.status,
+            })
+          )
+        }
+      } else if (event === 'task.end') {
+        const { taskId } = data
+        const log = started[taskId]
+        if (log !== undefined) {
+          // TODO: merge/transfer work-around
+          delete started[taskId]
+          log.end = time
+          log.status = computeStatus(
+            getStatus((log.result = data.result), data.status),
+            log.tasks
+          )
+        }
+      } else if (event === 'jobCall.start') {
+        const parent = started[data.runJobId]
+        if (parent !== undefined) {
+          ;(parent.tasks || (parent.tasks = [])).push(
+            (started[id] = {
+              data: {
+                type: 'VM',
+                id: data.params.id,
+              },
+              id,
+              start: time,
+              status: parent.status,
+            })
+          )
+        }
+      } else if (event === 'jobCall.end') {
+        const { runCallId } = data
+        const log = started[runCallId]
+        if (log !== undefined) {
+          delete started[runCallId]
+          log.end = time
+          log.status = computeStatus(
+            getStatus((log.result = data.error)),
+            log.tasks
+          )
+        }
+      }
+    })
+    return runId === undefined ? consolidated : consolidated[runId]
+  },
+}

packages/xo-server/src/xo-mixins/backups-ng/index.js

@@ -3,20 +3,11 @@
 // $FlowFixMe
 import type RemoteHandler from '@xen-orchestra/fs'
 import defer from 'golike-defer'
+import limitConcurrency from 'limit-concurrency-decorator'
 import { type Pattern, createPredicate } from 'value-matcher'
 import { type Readable, PassThrough } from 'stream'
 import { basename, dirname } from 'path'
-import {
-  forEach,
-  groupBy,
-  isEmpty,
-  last,
-  mapValues,
-  noop,
-  some,
-  sum,
-  values,
-} from 'lodash'
+import { isEmpty, last, mapValues, noop, some, sum, values } from 'lodash'
 import { fromEvent as pFromEvent, timeout as pTimeout } from 'promise-toolbox'
 import Vhd, {
   chainVhd,
@@ -42,10 +33,11 @@ import {
 
 import { translateLegacyJob } from './migration'
 
-type Mode = 'full' | 'delta'
-type ReportWhen = 'always' | 'failure' | 'never'
+export type Mode = 'full' | 'delta'
+export type ReportWhen = 'always' | 'failure' | 'never'
 
 type Settings = {|
+  concurrency?: number,
   deleteFirst?: boolean,
   exportRetention?: number,
   reportWhen?: ReportWhen,
@@ -92,33 +84,6 @@ type MetadataFull = {|
 |}
 type Metadata = MetadataDelta | MetadataFull
 
-type ConsolidatedJob = {|
-  duration?: number,
-  end?: number,
-  error?: Object,
-  id: string,
-  jobId: string,
-  mode: Mode,
-  start: number,
-  type: 'backup' | 'call',
-  userId: string,
-|}
-type ConsolidatedTask = {|
-  data?: Object,
-  duration?: number,
-  end?: number,
-  parentId: string,
-  message: string,
-  result?: Object,
-  start: number,
-  status: 'canceled' | 'failure' | 'success',
-  taskId: string,
-|}
-type ConsolidatedBackupNgLog = {
-  roots: Array<ConsolidatedJob>,
-  [parentId: string]: Array<ConsolidatedTask>,
-}
-
 const compareSnapshotTime = (a: Vm, b: Vm): number =>
   a.snapshot_time < b.snapshot_time ? -1 : 1
 
@@ -132,7 +97,9 @@ const compareTimestamp = (a: Metadata, b: Metadata): number =>
 const getOldEntries = <T>(retention: number, entries?: T[]): T[] =>
   entries === undefined
     ? []
-    : --retention > 0 ? entries.slice(0, -retention) : entries
+    : --retention > 0
+      ? entries.slice(0, -retention)
+      : entries
 
 const defaultSettings: Settings = {
   deleteFirst: false,
@@ -161,6 +128,7 @@ const getSetting = (
 const BACKUP_DIR = 'xo-vm-backups'
 const getVmBackupDir = (uuid: string) => `${BACKUP_DIR}/${uuid}`
 
+const isHiddenFile = (filename: string) => filename[0] === '.'
 const isMetadataFile = (filename: string) => filename.endsWith('.json')
 const isVhd = (filename: string) => filename.endsWith('.vhd')
 
@@ -333,7 +301,9 @@ const wrapTask = async <T>(opts: any, task: Promise<T>): Promise<T> => {
         result:
           result === undefined
             ? value
-            : typeof result === 'function' ? result(value) : result,
+            : typeof result === 'function'
+              ? result(value)
+              : result,
         status: 'success',
         taskId,
       })
@@ -372,7 +342,9 @@ const wrapTaskFn = <T>(
         result:
           result === undefined
             ? value
-            : typeof result === 'function' ? result(value) : result,
+            : typeof result === 'function'
+              ? result(value)
+              : result,
         status: 'success',
         taskId,
       })
@@ -434,6 +406,7 @@ export default class BackupNg {
     app.on('start', () => {
       const executor: Executor = async ({
         cancelToken,
+        data: vmId,
         job: job_,
         logger,
         runJobId,
@@ -444,18 +417,21 @@ export default class BackupNg {
         }
 
         const job: BackupJob = (job_: any)
-        const vms: $Dict<Vm> = app.getObjects({
-          filter: createPredicate({
-            type: 'VM',
-            ...job.vms,
-          }),
-        })
-        if (isEmpty(vms)) {
-          throw new Error('no VMs match this pattern')
+        let vms: $Dict<Vm>
+        if (vmId === undefined) {
+          vms = app.getObjects({
+            filter: createPredicate({
+              type: 'VM',
+              ...job.vms,
+            }),
+          })
+          if (isEmpty(vms)) {
+            throw new Error('no VMs match this pattern')
+          }
         }
         const jobId = job.id
         const scheduleId = schedule.id
-        await asyncMap(vms, async vm => {
+        let handleVm = async vm => {
           const { name_label: name, uuid } = vm
           const taskId: string = logger.notice(
             `Starting backup of ${name}. (${jobId})`,
@@ -507,7 +483,21 @@ export default class BackupNg {
                 : serializeError(error),
             })
           }
-        })
+        }
+
+        if (vmId !== undefined) {
+          return handleVm(await app.getObject(vmId))
+        }
+
+        const concurrency: number | void = getSetting(
+          job.settings,
+          'concurrency',
+          ''
+        )
+        if (concurrency !== undefined) {
+          handleVm = limitConcurrency(concurrency)(handleVm)
+        }
+        await asyncMap(vms, handleVm)
       }
       app.registerJobExecutor('backup', executor)
     })
@@ -1086,11 +1076,16 @@ export default class BackupNg {
                       let parentPath
                       if (isDelta) {
                         const vdiDir = dirname(path)
-                        const parent = (await handler.list(vdiDir))
-                          .filter(isVhd)
+                        parentPath = (await handler.list(vdiDir, {
+                          filter: filename =>
+                            !isHiddenFile(filename) && isVhd(filename),
+                          prependDir: true,
+                        }))
                           .sort()
                           .pop()
-                        parentPath = `${vdiDir}/${parent}`
+
+                        // ensure parent exists and is a valid VHD
+                        await new Vhd(handler, parentPath).readHeaderAndFooter()
                       }
 
                       await writeStream(
@@ -1305,62 +1300,4 @@ export default class BackupNg {
 
     return backups.sort(compareTimestamp)
   }
-
-  async getBackupNgLogs (runId?: string): Promise<ConsolidatedBackupNgLog> {
-    const rawLogs = await this._app.getLogs('jobs')
-
-    const logs: $Dict<ConsolidatedJob & ConsolidatedTask> = {}
-    forEach(rawLogs, (log, id) => {
-      const { data, time, message } = log
-      const { event } = data
-      delete data.event
-
-      switch (event) {
-        case 'job.start':
-          if (data.type === 'backup' && (runId === undefined || runId === id)) {
-            logs[id] = {
-              ...data,
-              id,
-              start: time,
-            }
-          }
-          break
-        case 'job.end':
-          const job = logs[data.runJobId]
-          if (job !== undefined) {
-            job.end = time
-            job.duration = time - job.start
-            job.error = data.error
-          }
-          break
-        case 'task.start':
-          if (logs[data.parentId] !== undefined) {
-            logs[id] = {
-              ...data,
-              start: time,
-              message,
-            }
-          }
-          break
-        case 'task.end':
-          const task = logs[data.taskId]
-          if (task !== undefined) {
-            // work-around
-            if (
-              time === task.start &&
-              (message === 'merge' || message === 'tranfer')
-            ) {
-              delete logs[data.taskId]
-            } else {
-              task.status = data.status
-              task.taskId = data.taskId
-              task.result = data.result
-              task.end = time
-              task.duration = time - task.start
-            }
-          }
-      }
-    })
-    return groupBy(logs, log => log.parentId || 'roots')
-  }
 }

packages/xo-server/src/xo-mixins/backups.js

@@ -903,6 +903,8 @@ export default class {
     const xapi = this._xo.getXapi(vm)
     vm = xapi.getObject(vm._xapiId)
 
+    await xapi._assertHealthyVdiChains(vm)
+
     const reg = new RegExp(
       '^rollingSnapshot_[^_]+_' + escapeStringRegexp(tag) + '_'
     )

packages/xo-server/src/xo-mixins/jobs/index.js

@@ -120,7 +120,11 @@ export default class Jobs {
   _executors: { __proto__: null, [string]: Executor }
   _jobs: JobsDb
   _logger: Logger
-  _runningJobs: { __proto__: null, [string]: boolean }
+  _runningJobs: { __proto__: null, [string]: string }
+
+  get runningJobs () {
+    return this._runningJobs
+  }
 
   constructor (xo: any) {
     this._app = xo
@@ -201,7 +205,7 @@ export default class Jobs {
     return /* await */ this._jobs.remove(id)
   }
 
-  async _runJob (cancelToken: any, job: Job, schedule?: Schedule) {
+  async _runJob (cancelToken: any, job: Job, schedule?: Schedule, data_?: any) {
     const { id } = job
 
     const runningJobs = this._runningJobs
@@ -232,6 +236,7 @@ export default class Jobs {
       event: 'job.start',
       userId: job.userId,
       jobId: id,
+      scheduleId: schedule?.id,
       // $FlowFixMe only defined for CallJob
       key: job.key,
       type,
@@ -245,9 +250,10 @@ export default class Jobs {
       session = app.createUserConnection()
       session.set('user_id', job.userId)
 
-      await executor({
+      const status = await executor({
         app,
         cancelToken,
+        data: data_,
         job,
         logger,
         runJobId,
@@ -259,7 +265,7 @@ export default class Jobs {
         runJobId,
       })
 
-      app.emit('job:terminated', runJobId, job, schedule)
+      app.emit('job:terminated', status, job, schedule, runJobId)
     } catch (error) {
       logger.error(`The execution of ${id} has failed.`, {
         event: 'job.end',
@@ -279,7 +285,8 @@ export default class Jobs {
   async runJobSequence (
     $cancelToken: any,
     idSequence: Array<string>,
-    schedule?: Schedule
+    schedule?: Schedule,
+    data?: any
   ) {
     const jobs = await Promise.all(
       mapToArray(idSequence, id => this.getJob(id))
@@ -289,7 +296,7 @@ export default class Jobs {
       if ($cancelToken.requested) {
         break
       }
-      await this._runJob($cancelToken, job, schedule)
+      await this._runJob($cancelToken, job, schedule, data)
     }
   }
 }

packages/xo-vmdk-to-vhd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-vmdk-to-vhd",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "AGPL-3.0",
   "description": "JS lib streaming a vmdk file to a vhd",
   "keywords": [
@@ -23,7 +23,7 @@
     "node": ">=4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.44",
+    "@babel/runtime": "^7.0.0-beta.49",
     "child-process-promise": "^2.0.3",
     "pipette": "^0.9.3",
     "promise-toolbox": "^0.9.5",
@@ -31,15 +31,15 @@
     "vhd-lib": "^0.1.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
+    "@babel/cli": "7.0.0-beta.49",
+    "@babel/core": "7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "7.0.0-beta.49",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "event-to-promise": "^0.8.0",
     "execa": "^0.10.0",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "^6.0.1",
     "get-stream": "^3.0.0",
     "index-modules": "^0.3.0",
     "rimraf": "^2.6.2"

packages/xo-web/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-web",
-  "version": "5.19.5",
+  "version": "5.19.8",
   "license": "AGPL-3.0",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [
@@ -30,7 +30,7 @@
     "node": ">=6"
   },
   "devDependencies": {
-    "@julien-f/freactal": "0.1.0",
+    "@julien-f/freactal": "0.1.1",
     "@nraynaud/novnc": "0.6.1",
     "@xen-orchestra/cron": "^1.0.3",
     "ansi_up": "^3.0.0",
@@ -89,8 +89,8 @@
     "lodash": "^4.6.1",
     "loose-envify": "^1.1.0",
     "make-error": "^1.3.2",
-    "marked": "^0.3.9",
-    "modular-cssify": "^8.0.0",
+    "marked": "^0.4.0",
+    "modular-cssify": "^10.0.0",
     "moment": "^2.20.1",
     "moment-timezone": "^0.5.14",
     "notifyjs": "^3.0.0",
@@ -120,7 +120,7 @@
     "react-test-renderer": "^15.6.2",
     "react-virtualized": "^9.15.0",
     "readable-stream": "^2.3.3",
-    "redux": "^3.7.2",
+    "redux": "^4.0.0",
     "redux-thunk": "^2.0.1",
     "reselect": "^2.5.4",
     "rimraf": "^2.6.2",
@@ -138,7 +138,7 @@
     "xo-common": "^0.1.1",
     "xo-lib": "^0.8.0",
     "xo-remote-parser": "^0.3",
-    "xo-vmdk-to-vhd": "^0.1.1"
+    "xo-vmdk-to-vhd": "^0.1.2"
   },
   "scripts": {
     "build": "NODE_ENV=production gulp build",

packages/xo-web/src/common/form/select.js

@@ -142,15 +142,15 @@ export default class Select extends React.PureComponent {
       simpleValue,
       value,
     } = props
+    let option
     if (
       autoSelectSingleOption &&
       options != null &&
-      options.length === 1 &&
       (value == null ||
         (simpleValue && value === '') ||
-        (multi && value.length === 0))
+        (multi && value.length === 0)) &&
+      ([option] = options.filter(_ => !_.disabled)).length === 1
     ) {
-      const option = options[0]
       props.onChange(
         simpleValue ? option[props.valueKey] : multi ? [option] : option
       )

packages/xo-web/src/common/intl/messages.js

@@ -259,6 +259,8 @@ const messages = {
   jobCallInProgess: 'In progress',
   jobTransferredDataSize: 'Transfer size:',
   jobTransferredDataSpeed: 'Transfer speed:',
+  operationSize: 'Size',
+  operationSpeed: 'Speed',
   jobMergedDataSize: 'Merge size:',
   jobMergedDataSpeed: 'Merge speed:',
   allJobCalls: 'All',
@@ -306,6 +308,7 @@ const messages = {
   taskMergedDataSize: 'Merge size',
   taskMergedDataSpeed: 'Merge speed',
   taskError: 'Error',
+  taskReason: 'Reason',
   saveBackupJob: 'Save',
   deleteBackupSchedule: 'Remove backup job',
   deleteBackupScheduleQuestion:
@@ -349,6 +352,7 @@ const messages = {
   reportWhenFailure: 'Failure',
   reportWhenNever: 'Never',
   reportWhen: 'Report when',
+  concurrency: 'Concurrency',
   newBackupSelection: 'Select your backup type:',
   smartBackupModeSelection: 'Select backup mode:',
   normalBackup: 'Normal backup',
@@ -597,11 +601,15 @@ const messages = {
   vmsTabName: 'Vms',
   srsTabName: 'Srs',
   // ----- Pool advanced tab -----
+  poolEditAll: 'Edit all',
+  poolEditRemoteSyslog: 'Edit remote syslog for all hosts',
   poolHaStatus: 'High Availability',
   poolHaEnabled: 'Enabled',
   poolHaDisabled: 'Disabled',
-  setpoolMaster: 'Master',
   poolGpuGroups: 'GPU groups',
+  poolRemoteSyslogPlaceHolder: 'Logging host',
+  setpoolMaster: 'Master',
+  syslogRemoteHost: 'Remote syslog host',
   // ----- Pool host tab -----
   hostNameLabel: 'Name',
   hostDescription: 'Description',
@@ -681,6 +689,7 @@ const messages = {
   hostLicenseType: 'Type',
   hostLicenseSocket: 'Socket',
   hostLicenseExpiry: 'Expiry',
+  hostRemoteSyslog: 'Remote syslog',
   supplementalPacks: 'Installed supplemental packs',
   supplementalPackNew: 'Install new supplemental pack',
   supplementalPackPoolNew: 'Install supplemental pack on every host',
@@ -735,6 +744,7 @@ const messages = {
   patchNameLabel: 'Name',
   patchUpdateButton: 'Install all patches',
   patchDescription: 'Description',
+  patchVersion: 'Version',
   patchApplied: 'Applied date',
   patchSize: 'Size',
   patchStatus: 'Status',
@@ -752,6 +762,15 @@ const messages = {
     'This will install a patch only on this host. This is NOT the recommended way: please go into the Pool patch view and follow instructions there. If you are sure about this, you can continue anyway',
   installPatchWarningReject: 'Go to pool',
   installPatchWarningResolve: 'Install',
+  patchRelease: 'Release',
+  updatePluginNotInstalled:
+    'Update plugin is not installed on this host. Please run `yum install xcp-ng-updater` first.',
+  showChangelog: 'Show changelog',
+  changelog: 'Changelog',
+  changelogPatch: 'Patch',
+  changelogAuthor: 'Author',
+  changelogDate: 'Date',
+  changelogDescription: 'Description',
   // ----- Pool patch tabs -----
   refreshPatches: 'Refresh patches',
   installPoolPatches: 'Install pool patches',
@@ -933,6 +952,7 @@ const messages = {
   defaultCpuCap: 'Default ({value, number})',
   pvArgsLabel: 'PV args',
   xenToolsStatus: 'Xen tools version',
+  xenToolsNotInstalled: 'Not installed',
   osName: 'OS name',
   osKernel: 'OS kernel',
   autoPowerOn: 'Auto power on',
@@ -1106,6 +1126,11 @@ const messages = {
   newVmSshKey: 'SSH key',
   newVmConfigDrive: 'Config drive',
   newVmCustomConfig: 'Custom config',
+  availableTemplateVarsInfo:
+    'Click here to see the available template variables',
+  availableTemplateVarsTitle: 'Available template variables',
+  templateNameInfo: 'the VM\'s name. It must not contain "_"',
+  templateIndexInfo: "the VM's index, it will take 0 in case of single VM",
   newVmBootAfterCreate: 'Boot VM after creation',
   newVmMacPlaceholder: 'Auto-generated if empty',
   newVmCpuWeightLabel: 'CPU weight',
@@ -1674,6 +1699,7 @@ const messages = {
   logIndicationToDisable: 'Click to disable',
   reportBug: 'Report a bug',
   unhealthyVdiChainError: 'Job canceled to protect the VDI chain',
+  backupRestartVm: "Restart VM's backup",
   clickForMoreInformation: 'Click for more information',
 
   // ----- IPs ------

packages/xo-web/src/common/render-xo-item.js

@@ -50,19 +50,17 @@ const SrItem = propTypes({
     return (state, props) => ({
       container: getContainer(state, props),
     })
-  })(({ sr, container }) => {
-    let label = `${sr.name_label || sr.id}`
-
-    if (isSrWritable(sr)) {
-      label += ` (${formatSize(sr.size - sr.physical_usage)} free)`
-    }
-
-    return (
-      <span>
-        <Icon icon='sr' /> {label}
-      </span>
-    )
-  })
+  })(({ sr, container }) => (
+    <span>
+      <Icon icon='sr' /> {sr.name_label || sr.id}
+      {container !== undefined && (
+        <span className='text-muted'> - {container.name_label}</span>
+      )}
+      {isSrWritable(sr) && (
+        <span>{` (${formatSize(sr.size - sr.physical_usage)} free)`}</span>
+      )}
+    </span>
+  ))
 )
 
 // VM.

packages/xo-web/src/common/select-objects.js

@@ -6,7 +6,6 @@ import {
   filter,
   flatten,
   forEach,
-  get,
   groupBy,
   includes,
   isArray,
@@ -362,40 +361,10 @@ export const SelectSr = makeStoreSelect(
     const getPools = createGetObjectsOfType('pool')
     const getHosts = createGetObjectsOfType('host')
 
-    const getSrsByContainer = createSelector(
-      createGetObjectsOfType('SR')
-        .filter((_, { predicate }) => predicate || isSrWritable)
-        .sort(),
-      createSelector(getHosts, getPools, (hosts, pools) => id =>
-        hosts[id] || pools[id]
-      ),
-      (srs, containerFinder) => {
-        const { length } = srs
-
-        if (length >= 2) {
-          let sr1, sr2
-          const srsToModify = {}
-          for (let i = 1; i < length; ++i) {
-            sr1 = srs[i]
-            for (let j = 0; j < i; ++j) {
-              sr2 = srs[j]
-              if (sr1.name_label === sr2.name_label) {
-                srsToModify[sr1.id] = sr1
-                srsToModify[sr2.id] = sr2
-              }
-            }
-          }
-          forEach(srsToModify, sr => {
-            sr.name_label = `(${get(
-              containerFinder(sr.$container),
-              'name_label'
-            )}) ${sr.name_label}`
-          })
-        }
-
-        return groupBy(srs, '$container')
-      }
-    )
+    const getSrsByContainer = createGetObjectsOfType('SR')
+      .filter((_, { predicate }) => predicate || isSrWritable)
+      .sort()
+      .groupBy('$container')
 
     const getContainerIds = createSelector(getSrsByContainer, srsByContainer =>
       keys(srsByContainer)

packages/xo-web/src/common/selectors.js

@@ -15,6 +15,7 @@ import {
   pickBy,
   size,
   slice,
+  some,
 } from 'lodash'
 
 import invoke from './invoke'
@@ -147,7 +148,9 @@ export const createFilter = (collection, predicate) =>
     _createCollectionWrapper(
       (collection, predicate) =>
         predicate === false
-          ? isArrayLike(collection) ? EMPTY_ARRAY : EMPTY_OBJECT
+          ? isArrayLike(collection)
+            ? EMPTY_ARRAY
+            : EMPTY_OBJECT
           : predicate
             ? (isArrayLike(collection) ? filter : pickBy)(collection, predicate)
             : collection
@@ -541,3 +544,9 @@ export const createGetVmDisks = vmSelector =>
       )
     )
   )
+
+export const getIsPoolAdmin = create(
+  create(createGetObjectsOfType('pool'), _createCollectionWrapper(Object.keys)),
+  getCheckPermissions,
+  (poolsIds, check) => some(poolsIds, poolId => check(poolId, 'administrate'))
+)

packages/xo-web/src/common/xo/create-network-modal/index.js

@@ -23,7 +23,7 @@ class CreateNetworkModalBody extends Component {
       pool: container.$pool,
       name: refs.name.value,
       description: refs.description.value,
-      pif: refs.pif.value.id,
+      pif: refs.pif.value && refs.pif.value.id,
       mtu: refs.mtu.value,
       vlan: refs.vlan.value,
     }

packages/xo-web/src/common/xo/index.js

@@ -9,6 +9,7 @@ import {
   assign,
   filter,
   forEach,
+  get,
   includes,
   isEmpty,
   isEqual,
@@ -576,6 +577,15 @@ export const editHost = (host, props) =>
 export const fetchHostStats = (host, granularity) =>
   _call('host.stats', { host: resolveId(host), granularity })
 
+export const setRemoteSyslogHost = (host, syslogDestination) =>
+  _call('host.setRemoteSyslogHost', {
+    id: resolveId(host),
+    syslogDestination,
+  })
+
+export const setRemoteSyslogHosts = (hosts, syslogDestination) =>
+  Promise.all(map(hosts, host => setRemoteSyslogHost(host, syslogDestination)))
+
 export const restartHost = (host, force = false) =>
   confirm({
     title: _('restartHostModalTitle'),
@@ -655,14 +665,26 @@ export const enableHost = host => _call('host.enable', { id: resolveId(host) })
 export const disableHost = host =>
   _call('host.disable', { id: resolveId(host) })
 
-export const getHostMissingPatches = host =>
-  _call('host.listMissingPatches', { host: resolveId(host) }).then(
-    patches =>
-      // Hide paid patches to XS-free users
-      host.license_params.sku_type !== 'free'
-        ? patches
-        : filter(patches, ['paid', false])
-  )
+const missingUpdatePluginByHost = { __proto__: null }
+export const getHostMissingPatches = async host => {
+  const hostId = resolveId(host)
+  if (host.productBrand !== 'XCP-ng') {
+    const patches = await _call('host.listMissingPatches', { host: hostId })
+    // Hide paid patches to XS-free users
+    return host.license_params.sku_type !== 'free'
+      ? patches
+      : filter(patches, { paid: false })
+  }
+  if (missingUpdatePluginByHost[hostId]) {
+    return null
+  }
+  try {
+    return await _call('host.listMissingPatches', { host: hostId })
+  } catch (_) {
+    missingUpdatePluginByHost[hostId] = true
+    return null
+  }
+}
 
 export const emergencyShutdownHost = host =>
   confirm({
@@ -1107,7 +1129,7 @@ export const migrateVms = vms =>
 
 export const createVm = args => _call('vm.create', args)
 
-export const createVms = (args, nameLabels) =>
+export const createVms = (args, nameLabels, cloudConfigs) =>
   confirm({
     title: _('newVmCreateVms'),
     body: _('newVmCreateVmsConfirm', { nbVms: nameLabels.length }),
@@ -1115,8 +1137,15 @@ export const createVms = (args, nameLabels) =>
     () =>
       Promise.all(
         map(nameLabels, (
-          name_label // eslint-disable-line camelcase
-        ) => _call('vm.create', { ...args, name_label }))
+          name_label, // eslint-disable-line camelcase
+          i
+        ) =>
+          _call('vm.create', {
+            ...args,
+            name_label,
+            cloudConfig: get(cloudConfigs, i),
+          })
+        )
       ),
     noop
   )

packages/xo-web/src/xo-app/backup-ng/new/index.js

@@ -35,7 +35,7 @@ import {
 
 import Schedules from './schedules'
 import SmartBackup from './smart-backup'
-import { FormGroup, getRandomId, Input, Ul, Li } from './utils'
+import { FormGroup, getRandomId, Input, Number, Ul, Li } from './utils'
 
 // ===================================================================
 
@@ -112,6 +112,7 @@ const getInitialState = () => ({
   $pool: {},
   backupMode: false,
   compression: true,
+  concurrency: 0,
   crMode: false,
   deltaMode: false,
   drMode: false,
@@ -158,6 +159,7 @@ export default [
             ...getNewSettings(state.newSchedules),
             '': {
               reportWhen: state.reportWhen,
+              concurrency: state.concurrency || undefined,
             },
           },
           remotes:
@@ -227,6 +229,7 @@ export default [
 
           if (id === '') {
             oldSetting.reportWhen = state.reportWhen
+            oldSetting.concurrency = state.concurrency || undefined
           } else if (!(id in settings)) {
             delete oldSettings[id]
           } else if (
@@ -330,6 +333,7 @@ export default [
           remotes,
           srs,
           reportWhen: get(globalSettings, 'reportWhen') || 'failure',
+          concurrency: get(globalSettings, 'concurrency') || 0,
           settings,
           schedules,
           ...destructVmsPattern(job.vms),
@@ -491,6 +495,10 @@ export default [
         ...state,
         reportWhen: value,
       }),
+      setConcurrency: (_, concurrency) => state => ({
+        ...state,
+        concurrency,
+      }),
     },
     computed: {
       needUpdateParams: (state, { job, schedules }) =>
@@ -751,6 +759,15 @@ export default [
                       valueKey='value'
                     />
                   </FormGroup>
+                  <FormGroup>
+                    <label>
+                      <strong>{_('concurrency')}</strong>
+                    </label>
+                    <Number
+                      onChange={effects.setConcurrency}
+                      value={state.concurrency}
+                    />
+                  </FormGroup>
                 </CardBlock>
               </Card>
             </Col>

packages/xo-web/src/xo-app/backup-ng/new/new-schedule.js

@@ -1,41 +1,13 @@
 import _ from 'intl'
 import ActionButton from 'action-button'
 import moment from 'moment-timezone'
-import PropTypes from 'prop-types'
 import React from 'react'
 import Scheduler, { SchedulePreview } from 'scheduling'
 import { Card, CardBlock } from 'card'
 import { injectState, provideState } from '@julien-f/freactal'
 import { isEqual } from 'lodash'
 
-import { FormGroup, getRandomId, Input } from './utils'
-
-const Number = [
-  provideState({
-    effects: {
-      onChange: (_, { target: { value } }) => (state, props) => {
-        if (value === '') {
-          return
-        }
-        props.onChange(+value)
-      },
-    },
-  }),
-  injectState,
-  ({ effects, state, value }) => (
-    <Input
-      type='number'
-      onChange={effects.onChange}
-      value={String(value)}
-      min='0'
-    />
-  ),
-].reduceRight((value, decorator) => decorator(value))
-
-Number.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  value: PropTypes.number.isRequired,
-}
+import { FormGroup, getRandomId, Number } from './utils'
 
 export default [
   injectState,

packages/xo-web/src/xo-app/backup-ng/new/utils.js

@@ -1,4 +1,6 @@
+import PropTypes from 'prop-types'
 import React from 'react'
+import { injectState, provideState } from '@julien-f/freactal'
 
 export const FormGroup = props => <div {...props} className='form-group' />
 export const Input = props => <input {...props} className='form-control' />
@@ -9,3 +11,30 @@ export const getRandomId = () =>
   Math.random()
     .toString(36)
     .slice(2)
+
+export const Number = [
+  provideState({
+    effects: {
+      onChange: (_, { target: { value } }) => (state, props) => {
+        if (value === '') {
+          return
+        }
+        props.onChange(+value)
+      },
+    },
+  }),
+  injectState,
+  ({ effects, state, value }) => (
+    <Input
+      type='number'
+      onChange={effects.onChange}
+      value={String(value)}
+      min='0'
+    />
+  ),
+].reduceRight((value, decorator) => decorator(value))
+
+Number.propTypes = {
+  onChange: PropTypes.func.isRequired,
+  value: PropTypes.number.isRequired,
+}

packages/xo-web/src/xo-app/home/index.js

@@ -74,6 +74,7 @@ import {
   createPager,
   createSelector,
   createSort,
+  getIsPoolAdmin,
   getUser,
   isAdmin,
 } from 'selectors'
@@ -302,6 +303,7 @@ const DEFAULT_TYPE = 'VM'
 })
 @propTypes({
   isAdmin: propTypes.bool.isRequired,
+  isPoolAdmin: propTypes.bool.isRequired,
   noResourceSets: propTypes.bool.isRequired,
 })
 class NoObjects_ extends Component {
@@ -309,6 +311,7 @@ class NoObjects_ extends Component {
     const {
       areObjectsFetched,
       isAdmin,
+      isPoolAdmin,
       noRegisteredServers,
       noResourceSets,
       noServersConnected,
@@ -378,7 +381,9 @@ class NoObjects_ extends Component {
       <CenterPanel>
         <Card shadow>
           <CardHeader>{_('homeNoVms')}</CardHeader>
-          {(isAdmin || !noResourceSets) && (
+          {(isAdmin ||
+            (isPoolAdmin && process.env.XOA_PLAN > 3) ||
+            !noResourceSets) && (
             <CardBlock>
               <Row>
                 <Col>
@@ -428,6 +433,7 @@ class NoObjects_ extends Component {
 
   return {
     isAdmin,
+    isPoolAdmin: getIsPoolAdmin,
     items: createSelector(
       createSelector(
         createGetObjectsOfType('host'),
@@ -818,7 +824,7 @@ export default class Home extends Component {
     const customFilters = this._getCustomFilters()
     const filteredItems = this._getFilteredItems()
     const nItems = this._getNumberOfItems()
-    const { isAdmin, items, noResourceSets, type } = this.props
+    const { isAdmin, isPoolAdmin, items, noResourceSets, type } = this.props
 
     const {
       selectedHosts,
@@ -906,7 +912,9 @@ export default class Home extends Component {
               </span>
             </div>
           </Col>
-          {(isAdmin || !noResourceSets) && (
+          {(isAdmin ||
+            (isPoolAdmin && process.env.XOA_PLAN > 3) ||
+            !noResourceSets) && (
             <Col mediumSize={3} className='text-xs-right'>
               <Link className='btn btn-success' to='/vms/new'>
                 <Icon icon='vm-new' /> {_('homeNewVm')}
@@ -1105,12 +1113,18 @@ export default class Home extends Component {
   // ---------------------------------------------------------------------------
 
   render () {
-    const { isAdmin, noResourceSets } = this.props
+    const { isAdmin, isPoolAdmin, noResourceSets } = this.props
 
     const nItems = this._getNumberOfItems()
 
     if (nItems < 1) {
-      return <NoObjects_ isAdmin={isAdmin} noResourceSets={noResourceSets} />
+      return (
+        <NoObjects_
+          isAdmin={isAdmin}
+          isPoolAdmin={isPoolAdmin}
+          noResourceSets={noResourceSets}
+        />
+      )
     }
 
     const filteredItems = this._getFilteredItems()

packages/xo-web/src/xo-app/host/index.js

@@ -8,13 +8,7 @@ import React, { cloneElement, Component } from 'react'
 import Tooltip from 'tooltip'
 import { Text } from 'editable'
 import { Container, Row, Col } from 'grid'
-import {
-  editHost,
-  fetchHostStats,
-  installAllHostPatches,
-  installHostPatch,
-  subscribeHostMissingPatches,
-} from 'xo'
+import { editHost, fetchHostStats, subscribeHostMissingPatches } from 'xo'
 import { connectStore, routes } from 'utils'
 import {
   createDoesHostNeedRestart,
@@ -110,7 +104,8 @@ const isRunning = host => host && host.power_state === 'Running'
 
     return {
       host,
-      hostPatches: getHostPatches(state, props),
+      hostPatches:
+        host.productBrand !== 'XCP-ng' && getHostPatches(state, props),
       logs: getLogs(state, props),
       memoryUsed: getMemoryUsed(state, props),
       needsRestart: doesNeedRestart(state, props),
@@ -207,21 +202,12 @@ export default class Host extends Component {
       host,
       missingPatches =>
         this.setState({
-          missingPatches: sortBy(missingPatches, patch => -patch.time),
+          missingPatches:
+            missingPatches && sortBy(missingPatches, patch => -patch.time),
         })
     )
   }
 
-  _installAllPatches = () => {
-    const { host } = this.props
-    return installAllHostPatches(host)
-  }
-
-  _installPatch = patch => {
-    const { host } = this.props
-    return installHostPatch(host, patch)
-  }
-
   _setNameDescription = nameDescription =>
     editHost(this.props.host, { name_description: nameDescription })
   _setNameLabel = nameLabel =>
@@ -331,11 +317,7 @@ export default class Host extends Component {
         'vmController',
         'vms',
       ]),
-      pick(this.state, ['missingPatches', 'statsOverview']),
-      {
-        installAllPatches: this._installAllPatches,
-        installPatch: this._installPatch,
-      }
+      pick(this.state, ['missingPatches', 'statsOverview'])
     )
     return (
       <Page

packages/xo-web/src/xo-app/host/tab-advanced.js

@@ -5,20 +5,22 @@ import React from 'react'
 import TabButton from 'tab-button'
 import SelectFiles from 'select-files'
 import Upgrade from 'xoa-upgrade'
-import { compareVersions, connectStore } from 'utils'
+import { Text } from 'editable'
 import { Toggle } from 'form'
+import { compareVersions, connectStore } from 'utils'
+import { FormattedRelative, FormattedTime } from 'react-intl'
+import { Container, Row, Col } from 'grid'
+import { forEach, map, noop } from 'lodash'
+import { createGetObjectsOfType, createSelector } from 'selectors'
 import {
   enableHost,
   detachHost,
   disableHost,
   forgetHost,
+  setRemoteSyslogHost,
   restartHost,
   installSupplementalPack,
 } from 'xo'
-import { FormattedRelative, FormattedTime } from 'react-intl'
-import { Container, Row, Col } from 'grid'
-import { createGetObjectsOfType, createSelector } from 'selectors'
-import { forEach, map, noop } from 'lodash'
 
 const ALLOW_INSTALL_SUPP_PACK = process.env.XOA_PLAN > 1
 
@@ -66,6 +68,7 @@ export default class extends Component {
       return uniqPacks
     }
   )
+  _setRemoteSyslogHost = value => setRemoteSyslogHost(this.props.host, value)
 
   render () {
     const { host, pcis, pgpus } = this.props
@@ -182,6 +185,15 @@ export default class extends Component {
                   <th>{_('hostIscsiName')}</th>
                   <Copiable tagName='td'>{host.iSCSI_name}</Copiable>
                 </tr>
+                <tr>
+                  <th>{_('hostRemoteSyslog')}</th>
+                  <td>
+                    <Text
+                      value={host.logging.syslog_destination || ''}
+                      onChange={this._setRemoteSyslogHost}
+                    />
+                  </td>
+                </tr>
               </tbody>
             </table>
             <br />

packages/xo-web/src/xo-app/host/tab-general.js

@@ -85,9 +85,9 @@ export default ({
         </Col>
         <Col mediumSize={3}>
           <p>
-            {host.license_params.sku_marketing_name} {host.version} ({
-              host.license_params.sku_type
-            })
+            {host.productBrand} {host.version} ({host.productBrand !== 'XCP-ng'
+              ? host.license_params.sku_type
+              : 'GPLv2'})
           </p>
         </Col>
         <Col mediumSize={3}>

packages/xo-web/src/xo-app/host/tab-network.js

@@ -15,6 +15,7 @@ import { connectStore, noop } from 'utils'
 import { Container, Row, Col } from 'grid'
 import { createGetObjectsOfType } from 'selectors'
 import { error } from 'notification'
+import { get } from 'xo-defined'
 import { Select, Number } from 'editable'
 import { Toggle } from 'form'
 import {
@@ -192,12 +193,18 @@ class PifItemLock extends Component {
 
   render () {
     const { networks, pif, vifsByNetwork } = this.props
+
+    const network = networks[pif.$network]
+    if (network === undefined) {
+      return null
+    }
+
     const pifInUse = some(vifsByNetwork[pif.$network], vif => vif.attached)
     return _toggleDefaultLockingMode(
       <Toggle
         disabled={pifInUse}
         onChange={this._editNetwork}
-        value={networks[pif.$network].defaultIsLocked}
+        value={network.defaultIsLocked}
       />,
       pifInUse && _('pifInUse')
     )
@@ -212,9 +219,11 @@ const COLUMNS = [
     sortCriteria: 'device',
   },
   {
-    itemRenderer: (pif, userData) => userData.networks[pif.$network].name_label,
+    itemRenderer: (pif, userData) =>
+      get(() => userData.networks[pif.$network].name_label),
     name: _('pifNetworkLabel'),
-    sortCriteria: (pif, userData) => userData.networks[pif.$network].name_label,
+    sortCriteria: (pif, userData) =>
+      get(() => userData.networks[pif.$network].name_label),
   },
   {
     component: PifItemVlan,

packages/xo-web/src/xo-app/host/tab-patches.js

@@ -1,15 +1,14 @@
 import _ from 'intl'
-import ActionRowButton from 'action-row-button'
 import React, { Component } from 'react'
 import SortedTable from 'sorted-table'
 import TabButton from 'tab-button'
 import Upgrade from 'xoa-upgrade'
-import { chooseAction } from 'modal'
+import { alert, chooseAction } from 'modal'
 import { connectStore, formatSize } from 'utils'
 import { Container, Row, Col } from 'grid'
 import { createDoesHostNeedRestart, createSelector } from 'selectors'
 import { FormattedRelative, FormattedTime } from 'react-intl'
-import { restartHost } from 'xo'
+import { restartHost, installAllHostPatches, installHostPatch } from 'xo'
 import { isEmpty, isString } from 'lodash'
 
 const MISSING_PATCH_COLUMNS = [
@@ -48,15 +47,76 @@ const MISSING_PATCH_COLUMNS = [
     itemRenderer: patch => patch.guidance,
     sortCriteria: patch => patch.guidance,
   },
+]
+
+const MISSING_PATCH_COLUMNS_XCP = [
   {
-    name: _('patchAction'),
-    itemRenderer: (patch, { installPatch, _installPatchWarning }) => (
-      <ActionRowButton
-        btnStyle='primary'
-        handler={() => _installPatchWarning(patch, installPatch)}
-        icon='host-patch-update'
-      />
-    ),
+    name: _('patchNameLabel'),
+    itemRenderer: patch => patch.name,
+    sortCriteria: 'name',
+  },
+  {
+    name: _('patchDescription'),
+    itemRenderer: patch => patch.description,
+    sortCriteria: 'description',
+  },
+  {
+    name: _('patchVersion'),
+    itemRenderer: patch => patch.version,
+  },
+  {
+    name: _('patchRelease'),
+    itemRenderer: patch => patch.release,
+  },
+  {
+    name: _('patchSize'),
+    itemRenderer: patch => formatSize(patch.size),
+    sortCriteria: 'size',
+  },
+]
+
+const INDIVIDUAL_ACTIONS_XCP = [
+  {
+    disabled: patch => patch.changelog === null,
+    handler: patch =>
+      alert(
+        _('changelog'),
+        <Container>
+          <Row className='mb-1'>
+            <Col size={3}>
+              <strong>{_('changelogPatch')}</strong>
+            </Col>
+            <Col size={9}>{patch.name}</Col>
+          </Row>
+          <Row className='mb-1'>
+            <Col size={3}>
+              <strong>{_('changelogDate')}</strong>
+            </Col>
+            <Col size={9}>
+              <FormattedTime
+                value={patch.changelog.date * 1000}
+                day='numeric'
+                month='long'
+                year='numeric'
+              />
+            </Col>
+          </Row>
+          <Row className='mb-1'>
+            <Col size={3}>
+              <strong>{_('changelogAuthor')}</strong>
+            </Col>
+            <Col size={9}>{patch.changelog.author}</Col>
+          </Row>
+          <Row>
+            <Col size={3}>
+              <strong>{_('changelogDescription')}</strong>
+            </Col>
+            <Col size={9}>{patch.changelog.description}</Col>
+          </Row>
+        </Container>
+      ),
+    icon: 'preview',
+    label: _('showChangelog'),
   },
 ]
 
@@ -118,10 +178,139 @@ const INSTALLED_PATCH_COLUMNS_2 = [
   },
 ]
 
+class XcpPatches extends Component {
+  render () {
+    const { missingPatches, host, installAllPatches } = this.props
+    const hasMissingPatches = !isEmpty(missingPatches)
+    return (
+      <Container>
+        <Row>
+          <Col className='text-xs-right'>
+            {this.props.needsRestart && (
+              <TabButton
+                btnStyle='warning'
+                handler={restartHost}
+                handlerParam={host}
+                icon='host-reboot'
+                labelId='rebootUpdateHostLabel'
+              />
+            )}
+            <TabButton
+              disabled={!hasMissingPatches}
+              btnStyle={hasMissingPatches ? 'primary' : undefined}
+              handler={installAllPatches}
+              icon={hasMissingPatches ? 'host-patch-update' : 'success'}
+              labelId={hasMissingPatches ? 'patchUpdateButton' : 'hostUpToDate'}
+            />
+          </Col>
+        </Row>
+        {hasMissingPatches && (
+          <Row>
+            <Col>
+              <SortedTable
+                columns={MISSING_PATCH_COLUMNS_XCP}
+                collection={missingPatches}
+                individualActions={INDIVIDUAL_ACTIONS_XCP}
+              />
+            </Col>
+          </Row>
+        )}
+      </Container>
+    )
+  }
+}
+
 @connectStore(() => ({
   needsRestart: createDoesHostNeedRestart((_, props) => props.host),
 }))
-export default class HostPatches extends Component {
+class XenServerPatches extends Component {
+  _getPatches = createSelector(
+    () => this.props.host,
+    () => this.props.hostPatches,
+    (host, hostPatches) => {
+      if (isEmpty(host.patches) && isEmpty(hostPatches)) {
+        return { patches: null }
+      }
+
+      if (isString(host.patches[0])) {
+        return {
+          patches: hostPatches,
+          columns: INSTALLED_PATCH_COLUMNS,
+        }
+      }
+
+      return {
+        patches: host.patches,
+        columns: INSTALLED_PATCH_COLUMNS_2,
+      }
+    }
+  )
+
+  _individualActions = [
+    {
+      name: _('patchAction'),
+      level: 'primary',
+      handler: this.props.installPatch,
+      icon: 'host-patch-update',
+    },
+  ]
+
+  render () {
+    const { host, missingPatches, installAllPatches } = this.props
+    const { patches, columns } = this._getPatches()
+    const hasMissingPatches = !isEmpty(missingPatches)
+    return (
+      <Container>
+        <Row>
+          <Col className='text-xs-right'>
+            {this.props.needsRestart && (
+              <TabButton
+                btnStyle='warning'
+                handler={restartHost}
+                handlerParam={host}
+                icon='host-reboot'
+                labelId='rebootUpdateHostLabel'
+              />
+            )}
+            <TabButton
+              disabled={!hasMissingPatches}
+              btnStyle={hasMissingPatches ? 'primary' : undefined}
+              handler={installAllPatches}
+              icon={hasMissingPatches ? 'host-patch-update' : 'success'}
+              labelId={hasMissingPatches ? 'patchUpdateButton' : 'hostUpToDate'}
+            />
+          </Col>
+        </Row>
+        {hasMissingPatches && (
+          <Row>
+            <Col>
+              <h3>{_('hostMissingPatches')}</h3>
+              <SortedTable
+                individualActions={this._individualActions}
+                collection={missingPatches}
+                columns={MISSING_PATCH_COLUMNS}
+              />
+            </Col>
+          </Row>
+        )}
+        <Row>
+          <Col>
+            {patches ? (
+              <span>
+                <h3>{_('hostAppliedPatches')}</h3>
+                <SortedTable collection={patches} columns={columns} />
+              </span>
+            ) : (
+              <h4 className='text-xs-center'>{_('patchNothing')}</h4>
+            )}
+          </Col>
+        </Row>
+      </Container>
+    )
+  }
+}
+
+export default class TabPatches extends Component {
   static contextTypes = {
     router: React.PropTypes.object,
   }
@@ -145,93 +334,31 @@ export default class HostPatches extends Component {
       : this.context.router.push(`/pools/${this.props.host.$pool}/patches`)
   }
 
-  _installPatchWarning = (patch, installPatch) =>
-    this._chooseActionPatch(() => installPatch(patch))
+  _installAllPatches = () =>
+    this._chooseActionPatch(() => installAllHostPatches(this.props.host))
 
-  _installAllPatchesWarning = installAllPatches =>
-    this._chooseActionPatch(installAllPatches)
-
-  _getPatches = createSelector(
-    () => this.props.host,
-    () => this.props.hostPatches,
-    (host, hostPatches) => {
-      if (isEmpty(host.patches) && isEmpty(hostPatches)) {
-        return { patches: null }
-      }
-
-      if (isString(host.patches[0])) {
-        return {
-          patches: hostPatches,
-          columns: INSTALLED_PATCH_COLUMNS,
-        }
-      }
-
-      return {
-        patches: host.patches,
-        columns: INSTALLED_PATCH_COLUMNS_2,
-      }
-    }
-  )
+  _installPatch = patch =>
+    this._chooseActionPatch(() => installHostPatch(this.props.host, patch))
 
   render () {
-    const { host, missingPatches, installAllPatches, installPatch } = this.props
-    const { patches, columns } = this._getPatches()
-    const hasMissingPatches = !isEmpty(missingPatches)
-    return process.env.XOA_PLAN > 1 ? (
-      <Container>
-        <Row>
-          <Col className='text-xs-right'>
-            {this.props.needsRestart && (
-              <TabButton
-                btnStyle='warning'
-                handler={restartHost}
-                handlerParam={host}
-                icon='host-reboot'
-                labelId='rebootUpdateHostLabel'
-              />
-            )}
-            <TabButton
-              disabled={!hasMissingPatches}
-              btnStyle={hasMissingPatches ? 'primary' : undefined}
-              handler={this._installAllPatchesWarning}
-              handlerParam={installAllPatches}
-              icon={hasMissingPatches ? 'host-patch-update' : 'success'}
-              labelId={hasMissingPatches ? 'patchUpdateButton' : 'hostUpToDate'}
-            />
-          </Col>
-        </Row>
-        {hasMissingPatches && (
-          <Row>
-            <Col>
-              <h3>{_('hostMissingPatches')}</h3>
-              <SortedTable
-                collection={missingPatches}
-                userData={{
-                  installPatch,
-                  _installPatchWarning: this._installPatchWarning,
-                }}
-                columns={MISSING_PATCH_COLUMNS}
-              />
-            </Col>
-          </Row>
-        )}
-        <Row>
-          <Col>
-            {patches ? (
-              <span>
-                <h3>{_('hostAppliedPatches')}</h3>
-                <SortedTable collection={patches} columns={columns} />
-              </span>
-            ) : (
-              <h4 className='text-xs-center'>{_('patchNothing')}</h4>
-            )}
-          </Col>
-        </Row>
-      </Container>
+    if (process.env.XOA_PLAN < 2) {
+      return (
+        <Container>
+          <Upgrade place='hostPatches' available={2} />
+        </Container>
+      )
+    }
+    if (this.props.missingPatches === null) {
+      return <em>{_('updatePluginNotInstalled')}</em>
+    }
+    return this.props.host.productBrand === 'XCP-ng' ? (
+      <XcpPatches {...this.props} installAllPatches={this._installAllPatches} />
     ) : (
-      <Container>
-        <Upgrade place='hostPatches' available={2} />
-      </Container>
+      <XenServerPatches
+        {...this.props}
+        installAllPatches={this._installAllPatches}
+        installPatch={this._installPatch}
+      />
     )
   }
 }

packages/xo-web/src/xo-app/jobs/new/index.js

@@ -374,9 +374,12 @@ export default class Jobs extends Component {
         forEach(item.values, valueItem => {
           forEach(valueItem, (value, key) => {
             if (data[key] === undefined) {
-              data[key] = []
+              data[key] = value
+            } else if (Array.isArray(data[key])) {
+              data[key].push(value)
+            } else {
+              data[key] = [data[key], value]
             }
-            data[key].push(value)
           })
         })
       })

packages/xo-web/src/xo-app/logs/backup-ng-logs.js

@@ -6,7 +6,7 @@ import React from 'react'
 import SortedTable from 'sorted-table'
 import { alert } from 'modal'
 import { Card, CardHeader, CardBlock } from 'card'
-import { forEach, keyBy } from 'lodash'
+import { keyBy } from 'lodash'
 import { FormattedDate } from 'react-intl'
 import { get } from 'xo-defined'
 import {
@@ -16,7 +16,6 @@ import {
 } from 'xo'
 
 import LogAlertBody from './log-alert-body'
-import { isSkippedError, NO_VMS_MATCH_THIS_PATTERN } from './utils'
 
 const STATUS_LABELS = {
   failure: {
@@ -31,7 +30,7 @@ const STATUS_LABELS = {
     className: 'success',
     label: 'jobSuccess',
   },
-  started: {
+  pending: {
     className: 'warning',
     label: 'jobStarted',
   },
@@ -94,10 +93,10 @@ const LOG_COLUMNS = [
   {
     name: _('jobDuration'),
     itemRenderer: log =>
-      log.duration !== undefined && (
-        <FormattedDuration duration={log.duration} />
+      log.end !== undefined && (
+        <FormattedDuration duration={log.end - log.start} />
       ),
-    sortCriteria: log => log.duration,
+    sortCriteria: log => log.end - log.start,
   },
   {
     name: _('jobStatus'),
@@ -108,15 +107,20 @@ const LOG_COLUMNS = [
   },
 ]
 
-const showCalls = (log, { logs, jobs }) =>
+const showTasks = log =>
   alert(
-    _('jobModalTitle', { job: log.jobId.slice(4, 8) }),
-    <LogAlertBody log={log} job={get(() => jobs[log.jobId])} logs={logs} />
+    <span>
+      {_('jobModalTitle', { job: log.jobId.slice(4, 8) })}{' '}
+      <span style={{ fontSize: '0.5em' }} className='text-muted'>
+        {log.id}
+      </span>
+    </span>,
+    <LogAlertBody log={log} />
   )
 
 const LOG_INDIVIDUAL_ACTIONS = [
   {
-    handler: showCalls,
+    handler: showTasks,
     icon: 'preview',
     label: _('logDisplayDetails'),
   },
@@ -138,38 +142,6 @@ const LOG_FILTERS = {
   jobSuccess: 'status: success',
 }
 
-const rowTransform = (log, { logs, jobs }) => {
-  let status
-  if (log.end !== undefined) {
-    if (log.error !== undefined) {
-      status =
-        log.error.message === NO_VMS_MATCH_THIS_PATTERN ? 'skipped' : 'failure'
-    } else {
-      let hasError = false
-      let hasTaskSkipped = false
-      forEach(logs[log.id], ({ status, result }) => {
-        if (status !== 'failure') {
-          return
-        }
-        if (result === undefined || !isSkippedError(result)) {
-          hasError = true
-          return false
-        }
-        hasTaskSkipped = true
-      })
-      status = hasError ? 'failure' : hasTaskSkipped ? 'skipped' : 'success'
-    }
-  } else {
-    status =
-      log.id === get(() => jobs[log.jobId].runId) ? 'started' : 'interrupted'
-  }
-
-  return {
-    ...log,
-    status,
-  }
-}
-
 export default [
   addSubscriptions({
     logs: subscribeBackupNgLogs,
@@ -183,15 +155,13 @@ export default [
       <CardBlock>
         <NoObjects
           actions={LOG_ACTIONS}
-          collection={get(() => logs['roots'])}
+          collection={logs}
           columns={LOG_COLUMNS}
           component={SortedTable}
           data-jobs={jobs}
-          data-logs={logs}
           emptyMessage={_('noLogs')}
           filters={LOG_FILTERS}
           individualActions={LOG_INDIVIDUAL_ACTIONS}
-          rowTransform={rowTransform}
         />
       </CardBlock>
     </Card>

packages/xo-web/src/xo-app/logs/index.js

@@ -13,8 +13,8 @@ import Tooltip from 'tooltip'
 import { alert } from 'modal'
 import { Card, CardHeader, CardBlock } from 'card'
 import { connectStore, formatSize, formatSpeed } from 'utils'
-import { createFilter, createGetObject, createSelector } from 'selectors'
-import { forEach, includes, keyBy, map, orderBy } from 'lodash'
+import { createGetObject, createSelector } from 'selectors'
+import { filter, forEach, includes, keyBy, map, orderBy } from 'lodash'
 import { FormattedDate } from 'react-intl'
 import { get } from 'xo-defined'
 import {
@@ -141,8 +141,6 @@ const isSkippedError = error =>
   error.message === UNHEALTHY_VDI_CHAIN_ERROR ||
   error.message === NO_SUCH_OBJECT_ERROR
 
-const filterOptionRenderer = ({ label }) => _(label)
-
 class Log extends BaseComponent {
   state = {
     filter: DEFAULT_CALL_FILTER,
@@ -154,21 +152,29 @@ class Log extends BaseComponent {
     (logId, runId) => logId !== runId
   )
 
-  _getFilteredCalls = createFilter(
+  _getCallsByState = createSelector(
     () => this.props.log.calls,
-    createSelector(
-      () => this.state.filter.value,
-      this._getIsJobInterrupted,
-      (value, isInterrupted) => PREDICATES[value](isInterrupted)
-    )
+    this._getIsJobInterrupted,
+    (calls, isInterrupted) => {
+      const callsByState = {}
+      forEach(CALL_FILTER_OPTIONS, ({ value }) => {
+        callsByState[value] = filter(calls, PREDICATES[value](isInterrupted))
+      })
+      return callsByState
+    }
   )
 
-  _filterValueRenderer = createSelector(
-    () => this._getFilteredCalls().length,
-    ({ label }) => label,
-    (size, label) => (
+  _getFilteredCalls = createSelector(
+    () => this.state.filter.value,
+    this._getCallsByState,
+    (value, calls) => calls[value]
+  )
+
+  _getFilterOptionRenderer = createSelector(
+    this._getCallsByState,
+    calls => ({ label, value }) => (
       <span>
-        {_(label)} ({size})
+        {_(label)} ({calls[value].length})
       </span>
     )
   )
@@ -190,12 +196,11 @@ class Log extends BaseComponent {
         <Select
           labelKey='label'
           onChange={this.linkState('filter')}
-          optionRenderer={filterOptionRenderer}
+          optionRenderer={this._getFilterOptionRenderer()}
           options={CALL_FILTER_OPTIONS}
           required
           value={this.state.filter}
           valueKey='value'
-          valueRenderer={this._filterValueRenderer}
         />
         <br />
         <ul className='list-group'>
@@ -394,7 +399,9 @@ const LOG_COLUMNS = [
               'tag',
               log.hasErrors
                 ? 'tag-danger'
-                : log.callSkipped ? 'tag-info' : 'tag-success'
+                : log.callSkipped
+                  ? 'tag-info'
+                  : 'tag-success'
             )}
           >
             {_('jobFinished')}

packages/xo-web/src/xo-app/logs/log-alert-body.js

@@ -1,4 +1,5 @@
 import _, { FormattedDuration } from 'intl'
+import ActionButton from 'action-button'
 import Copiable from 'copiable'
 import Icon from 'icon'
 import React from 'react'
@@ -6,37 +7,10 @@ import renderXoItem, { renderXoItemFromId } from 'render-xo-item'
 import Select from 'form/select'
 import Tooltip from 'tooltip'
 import { addSubscriptions, formatSize, formatSpeed } from 'utils'
-import { createSelector } from 'selectors'
-import { find, filter, isEmpty, get, keyBy, map, forEach } from 'lodash'
+import { filter, isEmpty, get, keyBy, map } from 'lodash'
 import { FormattedDate } from 'react-intl'
 import { injectState, provideState } from '@julien-f/freactal'
-import { subscribeRemotes } from 'xo'
-
-import {
-  isSkippedError,
-  NO_VMS_MATCH_THIS_PATTERN,
-  UNHEALTHY_VDI_CHAIN_ERROR,
-} from './utils'
-
-const getTaskStatus = createSelector(
-  taskLog => taskLog,
-  isJobRunning => isJobRunning,
-  ({ end, status, result }, isJobRunning) =>
-    end !== undefined
-      ? status === 'success'
-        ? 'success'
-        : result !== undefined && isSkippedError(result) ? 'skipped' : 'failure'
-      : isJobRunning ? 'started' : 'interrupted'
-)
-
-const getSubTaskStatus = createSelector(
-  taskLog => taskLog,
-  isJobRunning => isJobRunning,
-  ({ end, status, result }, isJobRunning) =>
-    end !== undefined
-      ? status === 'success' ? 'success' : 'failure'
-      : isJobRunning ? 'started' : 'interrupted'
-)
+import { runBackupNgJob, subscribeRemotes } from 'xo'
 
 const TASK_STATUS = {
   failure: {
@@ -51,7 +25,7 @@ const TASK_STATUS = {
     icon: 'running',
     label: 'taskSuccess',
   },
-  started: {
+  pending: {
     icon: 'busy',
     label: 'taskStarted',
   },
@@ -70,90 +44,60 @@ const TaskStateInfos = ({ status }) => {
   )
 }
 
-const VmTaskDataInfos = ({ logs, vmTaskId }) => {
-  let transferSize, transferDuration, mergeSize, mergeDuration
-  forEach(logs[vmTaskId], ({ taskId }) => {
-    if (transferSize !== undefined) {
-      return false
-    }
-
-    const transferTask = find(logs[taskId], { message: 'transfer' })
-    if (transferTask !== undefined) {
-      transferSize = transferTask.result.size
-      transferDuration = transferTask.end - transferTask.start
-    }
-
-    const mergeTask = find(logs[taskId], { message: 'merge' })
-    if (mergeTask !== undefined) {
-      mergeSize = mergeTask.result.size
-      mergeDuration = mergeTask.end - mergeTask.start
-    }
-  })
-
-  if (transferSize === undefined) {
-    return null
-  }
-
-  return (
-    <div>
-      {_.keyValue(_('taskTransferredDataSize'), formatSize(transferSize))}
-      <br />
-      {_.keyValue(
-        _('taskTransferredDataSpeed'),
-        formatSpeed(transferSize, transferDuration)
-      )}
-      {mergeSize !== undefined && (
-        <div>
-          {_.keyValue(_('taskMergedDataSize'), formatSize(mergeSize))}
-          <br />
-          {_.keyValue(
-            _('taskMergedDataSpeed'),
-            formatSpeed(mergeSize, mergeDuration)
-          )}
-        </div>
-      )}
-    </div>
+const TaskDate = ({ label, value }) =>
+  _.keyValue(
+    _(label),
+    <FormattedDate
+      value={new Date(value)}
+      month='short'
+      day='numeric'
+      year='numeric'
+      hour='2-digit'
+      minute='2-digit'
+      second='2-digit'
+    />
   )
-}
-
+const UNHEALTHY_VDI_CHAIN_ERROR = 'unhealthy VDI chain'
 const UNHEALTHY_VDI_CHAIN_LINK =
   'https://xen-orchestra.com/docs/backup_troubleshooting.html#vdi-chain-protection'
 
 const ALL_FILTER_OPTION = { label: 'allTasks', value: 'all' }
 const FAILURE_FILTER_OPTION = { label: 'taskFailed', value: 'failure' }
-const STARTED_FILTER_OPTION = { label: 'taskStarted', value: 'started' }
+const PENDING_FILTER_OPTION = { label: 'taskStarted', value: 'pending' }
+const INTERRUPTED_FILTER_OPTION = {
+  label: 'taskInterrupted',
+  value: 'interrupted',
+}
 const TASK_FILTER_OPTIONS = [
   ALL_FILTER_OPTION,
   FAILURE_FILTER_OPTION,
-  STARTED_FILTER_OPTION,
-  { label: 'taskInterrupted', value: 'interrupted' },
+  PENDING_FILTER_OPTION,
+  INTERRUPTED_FILTER_OPTION,
   { label: 'taskSkipped', value: 'skipped' },
   { label: 'taskSuccess', value: 'success' },
 ]
 
-const getFilteredTaskLogs = (logs, isJobRunning, filterValue) =>
+const getFilteredTaskLogs = (logs, filterValue) =>
   filterValue === 'all'
     ? logs
-    : filter(logs, log => getTaskStatus(log, isJobRunning) === filterValue)
+    : filter(logs, ({ status }) => status === filterValue)
 
-const getInitialFilter = (job, logs, log) => {
+const getInitialFilter = tasks => {
   const isEmptyFilter = filterValue =>
-    isEmpty(
-      getFilteredTaskLogs(
-        logs[log.id],
-        get(job, 'runId') === log.id,
-        filterValue
-      )
-    )
+    isEmpty(getFilteredTaskLogs(tasks, filterValue))
 
-  if (!isEmptyFilter('started')) {
-    return STARTED_FILTER_OPTION
+  if (!isEmptyFilter('pending')) {
+    return PENDING_FILTER_OPTION
   }
 
   if (!isEmptyFilter('failure')) {
     return FAILURE_FILTER_OPTION
   }
 
+  if (!isEmptyFilter('interrupted')) {
+    return INTERRUPTED_FILTER_OPTION
+  }
+
   return ALL_FILTER_OPTION
 }
 
@@ -165,43 +109,41 @@ export default [
       }),
   }),
   provideState({
-    initialState: ({ job, logs, log }) => ({
-      filter: getInitialFilter(job, logs, log),
+    initialState: ({ log }) => ({
+      filter: getInitialFilter(log.tasks),
     }),
     effects: {
       setFilter: (_, filter) => state => ({
         ...state,
         filter,
       }),
+      restartVmJob: (_, { vm }) => async (
+        _,
+        { log: { scheduleId, jobId } }
+      ) => {
+        await runBackupNgJob({
+          id: jobId,
+          vm,
+          schedule: scheduleId,
+        })
+      },
     },
     computed: {
-      isJobRunning: (_, { job, log }) => get(job, 'runId') === log.id,
-      filteredTaskLogs: ({ filter: { value }, isJobRunning }, { log, logs }) =>
-        getFilteredTaskLogs(logs[log.id], isJobRunning, value),
-      optionRenderer: ({ isJobRunning }, { log, logs }) => ({
-        label,
-        value,
-      }) => (
+      filteredTaskLogs: ({ filter: { value } }, { log }) =>
+        getFilteredTaskLogs(log.tasks, value),
+      optionRenderer: (state, { log }) => ({ label, value }) => (
         <span>
-          {_(label)} ({
-            getFilteredTaskLogs(logs[log.id], isJobRunning, value).length
-          })
+          {_(label)} ({getFilteredTaskLogs(log.tasks, value).length})
         </span>
       ),
     },
   }),
   injectState,
-  ({ job, log, logs, remotes, state, effects }) =>
-    log.error !== undefined ? (
-      <span
-        className={
-          log.error.message === NO_VMS_MATCH_THIS_PATTERN
-            ? 'text-info'
-            : 'text-danger'
-        }
-      >
-        <Copiable tagName='p' data={JSON.stringify(log.error, null, 2)}>
-          <Icon icon='alarm' /> {log.error.message}
+  ({ log, remotes, state, effects }) =>
+    log.result !== undefined ? (
+      <span className={log.status === 'skipped' ? 'text-info' : 'text-danger'}>
+        <Copiable tagName='p' data={JSON.stringify(log.result, null, 2)}>
+          <Icon icon='alarm' /> {log.result.message}
         </Copiable>
       </span>
     ) : (
@@ -217,18 +159,25 @@ export default [
         />
         <br />
         <ul className='list-group'>
-          {map(state.filteredTaskLogs, vmTaskLog => (
-            <li key={vmTaskLog.data.id} className='list-group-item'>
-              {renderXoItemFromId(vmTaskLog.data.id)} ({vmTaskLog.data.id.slice(
+          {map(state.filteredTaskLogs, taskLog => (
+            <li key={taskLog.data.id} className='list-group-item'>
+              {renderXoItemFromId(taskLog.data.id)} ({taskLog.data.id.slice(
                 4,
                 8
-              )}){' '}
-              <TaskStateInfos
-                status={getTaskStatus(vmTaskLog, state.isJobRunning)}
-              />
+              )}) <TaskStateInfos status={taskLog.status} />{' '}
+              {log.scheduleId !== undefined &&
+                taskLog.status === 'failure' && (
+                  <ActionButton
+                    handler={effects.restartVmJob}
+                    icon='run'
+                    size='small'
+                    tooltip={_('backupRestartVm')}
+                    data-vm={taskLog.data.id}
+                  />
+                )}
               <ul>
-                {map(logs[vmTaskLog.taskId], subTaskLog => (
-                  <li key={subTaskLog.taskId}>
+                {map(taskLog.tasks, subTaskLog => (
+                  <li key={subTaskLog.id}>
                     {subTaskLog.message === 'snapshot' ? (
                       <span>
                         <Icon icon='task' /> {_('snapshotVmLabel')}
@@ -251,61 +200,116 @@ export default [
                         )})
                       </span>
                     )}{' '}
-                    <TaskStateInfos
-                      status={getSubTaskStatus(subTaskLog, state.isJobRunning)}
-                    />
-                    <br />
-                    {subTaskLog.status === 'failure' && (
-                      <Copiable
-                        tagName='p'
-                        data={JSON.stringify(subTaskLog.result, null, 2)}
-                      >
-                        {_.keyValue(
-                          _('taskError'),
-                          <span className={'text-danger'}>
-                            {subTaskLog.result.message}
-                          </span>
-                        )}
-                      </Copiable>
+                    <TaskStateInfos status={subTaskLog.status} />
+                    <ul>
+                      {map(subTaskLog.tasks, operationLog => (
+                        <li key={operationLog.id}>
+                          <span>
+                            <Icon icon='task' /> {operationLog.message}
+                          </span>{' '}
+                          <TaskStateInfos status={operationLog.status} />
+                          <br />
+                          <TaskDate
+                            label='taskStart'
+                            value={operationLog.start}
+                          />
+                          {operationLog.end !== undefined && (
+                            <div>
+                              <TaskDate
+                                label='taskEnd'
+                                value={operationLog.end}
+                              />
+                              <br />
+                              {_.keyValue(
+                                _('taskDuration'),
+                                <FormattedDuration
+                                  duration={
+                                    operationLog.end - operationLog.start
+                                  }
+                                />
+                              )}
+                              <br />
+                              {operationLog.status === 'failure' ? (
+                                <Copiable
+                                  tagName='p'
+                                  data={JSON.stringify(
+                                    operationLog.result,
+                                    null,
+                                    2
+                                  )}
+                                >
+                                  {_.keyValue(
+                                    _('taskError'),
+                                    <span className='text-danger'>
+                                      {operationLog.result.message}
+                                    </span>
+                                  )}
+                                </Copiable>
+                              ) : (
+                                <div>
+                                  {_.keyValue(
+                                    _('operationSize'),
+                                    formatSize(operationLog.result.size)
+                                  )}
+                                  <br />
+                                  {_.keyValue(
+                                    _('operationSpeed'),
+                                    formatSpeed(
+                                      operationLog.result.size,
+                                      operationLog.end - operationLog.start
+                                    )
+                                  )}
+                                </div>
+                              )}
+                            </div>
+                          )}
+                        </li>
+                      ))}
+                    </ul>
+                    <TaskDate label='taskStart' value={subTaskLog.start} />
+                    {subTaskLog.end !== undefined && (
+                      <div>
+                        <TaskDate label='taskEnd' value={subTaskLog.end} />
+                        <br />
+                        {subTaskLog.message !== 'snapshot' &&
+                          _.keyValue(
+                            _('taskDuration'),
+                            <FormattedDuration
+                              duration={subTaskLog.end - subTaskLog.start}
+                            />
+                          )}
+                        <br />
+                        {subTaskLog.status === 'failure' &&
+                          subTaskLog.result !== undefined && (
+                            <Copiable
+                              tagName='p'
+                              data={JSON.stringify(subTaskLog.result, null, 2)}
+                            >
+                              {_.keyValue(
+                                _('taskError'),
+                                <span className='text-danger'>
+                                  {subTaskLog.result.message}
+                                </span>
+                              )}
+                            </Copiable>
+                          )}
+                      </div>
                     )}
                   </li>
                 ))}
               </ul>
-              {_.keyValue(
-                _('taskStart'),
-                <FormattedDate
-                  value={new Date(vmTaskLog.start)}
-                  month='short'
-                  day='numeric'
-                  year='numeric'
-                  hour='2-digit'
-                  minute='2-digit'
-                  second='2-digit'
-                />
-              )}
-              {vmTaskLog.end !== undefined && (
+              <TaskDate label='taskStart' value={taskLog.start} />
+              {taskLog.end !== undefined && (
                 <div>
-                  {_.keyValue(
-                    _('taskEnd'),
-                    <FormattedDate
-                      value={new Date(vmTaskLog.end)}
-                      month='short'
-                      day='numeric'
-                      year='numeric'
-                      hour='2-digit'
-                      minute='2-digit'
-                      second='2-digit'
-                    />
-                  )}
+                  <TaskDate label='taskEnd' value={taskLog.end} />
                   <br />
                   {_.keyValue(
                     _('taskDuration'),
-                    <FormattedDuration duration={vmTaskLog.duration} />
+                    <FormattedDuration duration={taskLog.end - taskLog.start} />
                   )}
                   <br />
-                  {vmTaskLog.status === 'failure' &&
-                  vmTaskLog.result !== undefined ? (
-                    vmTaskLog.result.message === UNHEALTHY_VDI_CHAIN_ERROR ? (
+                  {taskLog.result !== undefined ? (
+                    taskLog.result.message === UNHEALTHY_VDI_CHAIN_ERROR ? (
                       <Tooltip content={_('clickForMoreInformation')}>
                         <a
                           className='text-info'
@@ -319,24 +323,59 @@ export default [
                     ) : (
                       <Copiable
                         tagName='p'
-                        data={JSON.stringify(vmTaskLog.result, null, 2)}
+                        data={JSON.stringify(taskLog.result, null, 2)}
                       >
                         {_.keyValue(
-                          _('taskError'),
+                          taskLog.status === 'skipped'
+                            ? _('taskReason')
+                            : _('taskError'),
                           <span
                             className={
-                              isSkippedError(vmTaskLog.result)
+                              taskLog.status === 'skipped'
                                 ? 'text-info'
                                 : 'text-danger'
                             }
                           >
-                            {vmTaskLog.result.message}
+                            {taskLog.result.message}
                           </span>
                         )}
                       </Copiable>
                     )
                   ) : (
-                    <VmTaskDataInfos logs={logs} vmTaskId={vmTaskLog.taskId} />
+                    <div>
+                      {taskLog.transfer !== undefined && (
+                        <div>
+                          {_.keyValue(
+                            _('taskTransferredDataSize'),
+                            formatSize(taskLog.transfer.size)
+                          )}
+                          <br />
+                          {_.keyValue(
+                            _('taskTransferredDataSpeed'),
+                            formatSpeed(
+                              taskLog.transfer.size,
+                              taskLog.transfer.duration
+                            )
+                          )}
+                        </div>
+                      )}
+                      {taskLog.merge !== undefined && (
+                        <div>
+                          {_.keyValue(
+                            _('taskMergedDataSize'),
+                            formatSize(taskLog.merge.size)
+                          )}
+                          <br />
+                          {_.keyValue(
+                            _('taskMergedDataSpeed'),
+                            formatSpeed(
+                              taskLog.merge.size,
+                              taskLog.merge.duration
+                            )
+                          )}
+                        </div>
+                      )}
+                    </div>
                   )}
                 </div>
               )}

packages/xo-web/src/xo-app/logs/utils.js

@@ -1,7 +0,0 @@
-export const NO_VMS_MATCH_THIS_PATTERN = 'no VMs match this pattern'
-export const UNHEALTHY_VDI_CHAIN_ERROR = 'unhealthy VDI chain'
-const NO_SUCH_OBJECT_ERROR = 'no such object'
-
-export const isSkippedError = error =>
-  error.message === UNHEALTHY_VDI_CHAIN_ERROR ||
-  error.message === NO_SUCH_OBJECT_ERROR

packages/xo-web/src/xo-app/menu/index.js

@@ -19,6 +19,7 @@ import {
   createFilter,
   createGetObjectsOfType,
   createSelector,
+  getIsPoolAdmin,
   getStatus,
   getUser,
   isAdmin,
@@ -31,6 +32,7 @@ const returnTrue = () => true
 @connectStore(
   () => ({
     isAdmin,
+    isPoolAdmin: getIsPoolAdmin,
     nTasks: createGetObjectsOfType('task').count([
       task => task.status === 'pending',
     ]),
@@ -80,11 +82,6 @@ export default class Menu extends Component {
     isEmpty
   )
 
-  _getNoOperatableSrs = createSelector(
-    createFilter(() => this.props.srs, this._checkPermissions),
-    isEmpty
-  )
-
   _getNoResourceSets = createSelector(() => this.props.resourceSets, isEmpty)
 
   get height () {
@@ -108,9 +105,17 @@ export default class Menu extends Component {
   }
 
   render () {
-    const { isAdmin, nTasks, status, user, pools, nHosts } = this.props
+    const {
+      isAdmin,
+      isPoolAdmin,
+      nTasks,
+      status,
+      user,
+      pools,
+      nHosts,
+      srs,
+    } = this.props
     const noOperatablePools = this._getNoOperatablePools()
-    const noOperatableSrs = this._getNoOperatableSrs()
     const noResourceSets = this._getNoResourceSets()
 
     /* eslint-disable object-property-newline */
@@ -136,7 +141,7 @@ export default class Menu extends Component {
             icon: 'template',
             label: 'homeTemplatePage',
           },
-          !noOperatableSrs && {
+          !isEmpty(srs) && {
             to: '/home?t=SR',
             icon: 'sr',
             label: 'homeSrPage',
@@ -313,7 +318,9 @@ export default class Menu extends Component {
         icon: 'menu-new',
         label: 'newMenu',
         subMenu: [
-          (isAdmin || !noResourceSets) && {
+          (isAdmin ||
+            (isPoolAdmin && process.env.XOA_PLAN > 3) ||
+            !noResourceSets) && {
             to: '/vms/new',
             icon: 'menu-new-vm',
             label: 'newVmPage',

packages/xo-web/src/xo-app/new-vm/index.css

@@ -63,7 +63,7 @@
   margin: auto;
 }
 
-.refreshNames {
+.refreshNames, .availableTemplateVars {
   cursor: pointer;
 }
 

packages/xo-web/src/xo-app/new-vm/index.js

@@ -13,6 +13,7 @@ import store from 'store'
 import Tags from 'tags'
 import Tooltip from 'tooltip'
 import Wizard, { Section } from 'wizard'
+import { alert } from 'modal'
 import { Container, Row, Col } from 'grid'
 import { injectIntl } from 'react-intl'
 import {
@@ -30,8 +31,8 @@ import {
   isEmpty,
   join,
   map,
-  slice,
   size,
+  slice,
   sum,
   sumBy,
 } from 'lodash'
@@ -73,12 +74,14 @@ import {
   getCoresPerSocketPossibilities,
   generateReadableRandomString,
   noop,
+  resolveIds,
   resolveResourceSet,
 } from 'utils'
 import {
   createSelector,
   createGetObject,
   createGetObjectsOfType,
+  getIsPoolAdmin,
   getUser,
 } from 'selectors'
 
@@ -87,6 +90,32 @@ import styles from './index.css'
 const NB_VMS_MIN = 2
 const NB_VMS_MAX = 100
 
+const AVAILABLE_TEMPLATE_VARS = {
+  '{name}': 'templateNameInfo',
+  '%': 'templateIndexInfo',
+}
+
+const showAvailableTemplateVars = () =>
+  alert(
+    _('availableTemplateVarsTitle'),
+    <ul>
+      {map(AVAILABLE_TEMPLATE_VARS, (value, key) => (
+        <li key={key}>{_.keyValue(key, _(value))}</li>
+      ))}
+    </ul>
+  )
+
+const AvailableTemplateVarsInfo = () => (
+  <Tooltip content={_('availableTemplateVarsInfo')}>
+    <a
+      className={classNames('text-info', styles.availableTemplateVars)}
+      onClick={showAvailableTemplateVars}
+    >
+      <Icon icon='info' />
+    </a>
+  </Tooltip>
+)
+
 /* eslint-disable camelcase */
 
 const getObject = createGetObject((_, id) => id)
@@ -210,6 +239,7 @@ class Vif extends BaseComponent {
 })
 @connectStore(() => ({
   isAdmin: createSelector(getUser, user => user && user.permission === 'admin'),
+  isPoolAdmin: getIsPoolAdmin,
   networks: createGetObjectsOfType('network').sort(),
   pool: createGetObject((_, props) => props.location.query.pool),
   pools: createGetObjectsOfType('pool'),
@@ -241,7 +271,9 @@ export default class NewVm extends BaseComponent {
 
   _getResourceSet = () => {
     const {
-      location: { query: { resourceSet: resourceSetId } },
+      location: {
+        query: { resourceSet: resourceSetId },
+      },
       resourceSets,
     } = this.props
     return resourceSets && find(resourceSets, ({ id }) => id === resourceSetId)
@@ -292,7 +324,7 @@ export default class NewVm extends BaseComponent {
       name_label: '',
       name_description: '',
       nameLabels: map(Array(NB_VMS_MIN), (_, index) => `VM_${index + 1}`),
-      namePattern: '{name}_%',
+      namePattern: '{name}%',
       nbVms: NB_VMS_MIN,
       VDIs: [],
       VIFs: [],
@@ -330,6 +362,7 @@ export default class NewVm extends BaseComponent {
     }
 
     let cloudConfig
+    let cloudConfigs
     if (state.configDrive) {
       const hostname = state.name_label
         .replace(/^\s+|\s+$/g, '')
@@ -344,7 +377,14 @@ export default class NewVm extends BaseComponent {
           ''
         )}`
       } else {
-        cloudConfig = state.customConfig
+        const replacer = this._buildTemplate(state.customConfig)
+        cloudConfig = replacer(this.state.state, 0)
+        if (state.multipleVms) {
+          const seqStart = state.seqStart
+          cloudConfigs = map(state.nameLabels, (_, i) =>
+            replacer(state, i + +seqStart)
+          )
+        }
       }
     } else if (state.template.name_label === 'CoreOS') {
       cloudConfig = state.cloudConfig
@@ -403,7 +443,7 @@ export default class NewVm extends BaseComponent {
     }
 
     return state.multipleVms
-      ? createVms(data, state.nameLabels)
+      ? createVms(data, state.nameLabels, cloudConfigs)
       : createVm(data)
   }
 
@@ -435,7 +475,7 @@ export default class NewVm extends BaseComponent {
           $SR:
             pool || isInResourceSet(vdi.$SR)
               ? vdi.$SR
-              : resourceSet.objectsByType['SR'][0].id,
+              : this._getDefaultSr(template),
         }
       }
     })
@@ -464,7 +504,7 @@ export default class NewVm extends BaseComponent {
       state.name_description === '' || !state.name_descriptionHasChanged
         ? template.name_description || ''
         : state.name_description
-    const replacer = this._buildTemplate()
+    const replacer = this._buildVmsNameTemplate()
     this._setState({
       // infos
       name_label,
@@ -484,7 +524,7 @@ export default class NewVm extends BaseComponent {
         'SSH',
       sshKeys: this.props.userSshKeys && this.props.userSshKeys.length && [0],
       customConfig:
-        '#cloud-config\n#hostname: myhostname\n#ssh_authorized_keys:\n#  - ssh-rsa <myKey>\n#packages:\n#  - htop\n',
+        '#cloud-config\n#hostname: {name}%\n#ssh_authorized_keys:\n#  - ssh-rsa <myKey>\n#packages:\n#  - htop\n',
       // interfaces
       VIFs,
       // disks
@@ -495,7 +535,7 @@ export default class NewVm extends BaseComponent {
           name_description: disk.name_description || 'Created by XO',
           name_label:
             (name_label || 'disk') + '_' + generateReadableRandomString(5),
-          SR: pool ? pool.default_SR : resourceSet.objectsByType['SR'][0].id,
+          SR: this._getDefaultSr(template),
         }
       }),
     })
@@ -592,15 +632,18 @@ export default class NewVm extends BaseComponent {
     })
     return network && network.id
   }
-  _buildTemplate = createSelector(
+
+  _buildVmsNameTemplate = createSelector(
     () => this.state.state.namePattern,
-    namePattern =>
-      buildTemplate(namePattern, {
-        '{name}': state => state.name_label || '',
-        '%': (_, i) => i,
-      })
+    namePattern => this._buildTemplate(namePattern)
   )
 
+  _buildTemplate = pattern =>
+    buildTemplate(pattern, {
+      '{name}': state => state.name_label || '',
+      '%': (_, i) => i,
+    })
+
   _getVgpuTypePredicate = createSelector(
     () => this.props.pool,
     pool => vgpuType => pool !== undefined && pool.id === vgpuType.$pool
@@ -630,7 +673,7 @@ export default class NewVm extends BaseComponent {
     if (nbVmsClamped < nameLabels.length) {
       this._setState({ nameLabels: slice(newNameLabels, 0, nbVmsClamped) })
     } else {
-      const replacer = this._buildTemplate()
+      const replacer = this._buildVmsNameTemplate()
       for (
         let i = +seqStart + nameLabels.length;
         i <= +seqStart + nbVmsClamped - 1;
@@ -645,7 +688,7 @@ export default class NewVm extends BaseComponent {
     const { nameLabels, seqStart } = this.state.state
     const nbVms = nameLabels.length
     const newNameLabels = []
-    const replacer = this._buildTemplate()
+    const replacer = this._buildVmsNameTemplate()
 
     for (let i = +seqStart; i <= +seqStart + nbVms - 1; i++) {
       newNameLabels.push(replacer(this.state.state, i))
@@ -670,9 +713,34 @@ export default class NewVm extends BaseComponent {
     })
     this._reset()
   }
+  _getDefaultSr = template => {
+    const { pool } = this.props
+
+    if (pool !== undefined) {
+      return pool.default_SR
+    }
+
+    if (template === undefined) {
+      return
+    }
+
+    const defaultSr = getObject(store.getState(), template.$pool, true)
+      .default_SR
+
+    return includes(
+      resolveIds(
+        filter(
+          this._getResolvedResourceSet().objectsByType.SR,
+          this._getSrPredicate()
+        )
+      ),
+      defaultSr
+    )
+      ? defaultSr
+      : undefined
+  }
   _addVdi = () => {
     const { state } = this.state
-    const { pool } = this.props
 
     this._setState({
       VDIs: [
@@ -683,7 +751,7 @@ export default class NewVm extends BaseComponent {
             (state.name_label || 'disk') +
             '_' +
             generateReadableRandomString(5),
-          SR: pool && pool.default_SR,
+          SR: this._getDefaultSr(state.template),
           type: 'system',
         },
       ],
@@ -744,7 +812,7 @@ export default class NewVm extends BaseComponent {
   // MAIN ------------------------------------------------------------------------
 
   _renderHeader = () => {
-    const { isAdmin, pool, resourceSets } = this.props
+    const { isAdmin, isPoolAdmin, pool, resourceSets } = this.props
     const selectPool = (
       <span className={styles.inlineSelect}>
         <SelectPool onChange={this._selectPool} value={pool} />
@@ -763,9 +831,12 @@ export default class NewVm extends BaseComponent {
         <Row>
           <Col mediumSize={12}>
             <h2>
-              {isAdmin || !isEmpty(resourceSets)
+              {isAdmin ||
+              (isPoolAdmin && process.env.XOA_PLAN > 3) ||
+              !isEmpty(resourceSets)
                 ? _('newVmCreateNewVmOn', {
-                    select: isAdmin ? selectPool : selectResourceSet,
+                    select:
+                      isAdmin || isPoolAdmin ? selectPool : selectResourceSet,
                   })
                 : _('newVmCreateNewVmNoPermission')}
             </h2>
@@ -1027,7 +1098,11 @@ export default class NewVm extends BaseComponent {
                 value='customConfig'
               />
               &nbsp;
-              <span>{_('newVmCustomConfig')}</span>
+              <span>
+                {_('newVmCustomConfig')}
+                &nbsp;
+                <AvailableTemplateVarsInfo />
+              </span>
               &nbsp;
               <DebounceTextarea
                 className={classNames('form-control', styles.customConfig)}
@@ -1158,7 +1233,9 @@ export default class NewVm extends BaseComponent {
   // INTERFACES ------------------------------------------------------------------
 
   _renderInterfaces = () => {
-    const { state: { VIFs } } = this.state
+    const {
+      state: { VIFs },
+    } = this.state
 
     return (
       <Section
@@ -1199,7 +1276,9 @@ export default class NewVm extends BaseComponent {
   // DISKS -----------------------------------------------------------------------
 
   _renderDisks = () => {
-    const { state: { configDrive, existingDisks, VDIs } } = this.state
+    const {
+      state: { configDrive, existingDisks, VDIs },
+    } = this.state
     const { pool } = this.props
     let i = 0
     const resourceSet = this._getResolvedResourceSet()
@@ -1481,6 +1560,8 @@ export default class NewVm extends BaseComponent {
                 )}
                 value={namePattern}
               />
+              &nbsp;
+              <AvailableTemplateVarsInfo />
             </Item>
             <Item label={_('newVmFirstIndex')}>
               <DebounceInput
@@ -1491,6 +1572,16 @@ export default class NewVm extends BaseComponent {
                 value={seqStart}
               />
             </Item>
+            <Item>
+              <Tooltip content={_('newVmNameRefresh')}>
+                <a
+                  className={styles.refreshNames}
+                  onClick={this._updateNameLabels}
+                >
+                  <Icon icon='refresh' />
+                </a>
+              </Tooltip>
+            </Item>
             <Item className='input-group'>
               <DebounceInput
                 className='form-control'
@@ -1509,16 +1600,6 @@ export default class NewVm extends BaseComponent {
                 </Tooltip>
               </span>
             </Item>
-            <Item>
-              <Tooltip content={_('newVmNameRefresh')}>
-                <a
-                  className={styles.refreshNames}
-                  onClick={this._updateNameLabels}
-                >
-                  <Icon icon='refresh' />
-                </a>
-              </Tooltip>
-            </Item>
             {multipleVms && (
               <LineItem>
                 {map(nameLabels, (nameLabel, index) => (

packages/xo-web/src/xo-app/pool/tab-advanced.js

@@ -1,17 +1,25 @@
 import React from 'react'
 
-import _ from 'intl'
+import _, { messages } from 'intl'
+import ActionButton from 'action-button'
+import ActionRowButton from 'action-row-button'
 import Component from 'base-component'
 import Copiable from 'copiable'
 import renderXoItem from 'render-xo-item'
 import SelectFiles from 'select-files'
 import Upgrade from 'xoa-upgrade'
-import { connectStore } from 'utils'
-import { createGetObjectsOfType } from 'selectors'
-import { XoSelect } from 'editable'
-import { installSupplementalPackOnAllHosts, setPoolMaster } from 'xo'
 import { map } from 'lodash'
+import { connectStore } from 'utils'
+import { injectIntl } from 'react-intl'
+import { createGetObjectsOfType } from 'selectors'
+import { Text, XoSelect } from 'editable'
 import { Container, Row, Col } from 'grid'
+import {
+  installSupplementalPackOnAllHosts,
+  setPoolMaster,
+  setRemoteSyslogHost,
+  setRemoteSyslogHosts,
+} from 'xo'
 
 @connectStore(() => ({
   master: createGetObjectsOfType('host').find((_, { pool }) => ({
@@ -39,56 +47,128 @@ class PoolMaster extends Component {
   }
 }
 
-export default connectStore({
+@injectIntl
+@connectStore({
+  hosts: createGetObjectsOfType('host')
+    .filter((_, { pool }) => ({ $pool: pool.id }))
+    .sort(),
   gpuGroups: createGetObjectsOfType('gpuGroup'),
-})(({ gpuGroups, pool }) => (
-  <div>
-    <h3 className='mb-1'>{_('xenSettingsLabel')}</h3>
-    <Container>
-      <Row>
-        <Col size={3}>
-          <strong>{_('uuid')}</strong>
-        </Col>
-        <Col size={9}>
-          <Copiable tagName='div'>{pool.uuid}</Copiable>
-        </Col>
-      </Row>
-      <Row>
-        <Col size={3}>
-          <strong>{_('poolHaStatus')}</strong>
-        </Col>
-        <Col size={9}>
-          {pool.HA_enabled ? _('poolHaEnabled') : _('poolHaDisabled')}
-        </Col>
-      </Row>
-      <Row>
-        <Col size={3}>
-          <strong>{_('setpoolMaster')}</strong>
-        </Col>
-        <Col size={9}>
-          <PoolMaster pool={pool} />
-        </Col>
-      </Row>
-    </Container>
-    <h3 className='mt-1 mb-1'>{_('poolGpuGroups')}</h3>
-    <Container>
-      <Row>
-        <Col size={9}>
-          <ul className='list-group'>
-            {map(gpuGroups, gpuGroup => (
-              <li key={gpuGroup.id} className='list-group-item'>
-                {renderXoItem(gpuGroup)}
-              </li>
-            ))}
-          </ul>
-        </Col>
-      </Row>
-    </Container>
-    <h3 className='mt-1 mb-1'>{_('supplementalPackPoolNew')}</h3>
-    <Upgrade place='poolSupplementalPacks' required={2}>
-      <SelectFiles
-        onChange={file => installSupplementalPackOnAllHosts(pool, file)}
-      />
-    </Upgrade>
-  </div>
-))
+})
+export default class TabAdvanced extends Component {
+  _setRemoteSyslogHosts = () =>
+    setRemoteSyslogHosts(this.props.hosts, this.state.syslogDestination).then(
+      () => this.setState({ editRemoteSyslog: false, syslogDestination: '' })
+    )
+
+  render () {
+    const { hosts, gpuGroups, pool } = this.props
+    const { state } = this
+    const { editRemoteSyslog } = state
+    return (
+      <div>
+        <Container>
+          <Row>
+            <Col>
+              <h3>{_('xenSettingsLabel')}</h3>
+              <table className='table'>
+                <tbody>
+                  <tr>
+                    <th>{_('uuid')}</th>
+                    <Copiable tagName='td'>{pool.uuid}</Copiable>
+                  </tr>
+                  <tr>
+                    <th>{_('poolHaStatus')}</th>
+                    <td>
+                      {pool.HA_enabled
+                        ? _('poolHaEnabled')
+                        : _('poolHaDisabled')}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>{_('setpoolMaster')}</th>
+                    <td>
+                      <PoolMaster pool={pool} />
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>{_('syslogRemoteHost')}</th>
+                    <td>
+                      <ul className='pl-0'>
+                        {map(hosts, host => (
+                          <li key={host.id}>
+                            <span>{`${host.name_label}: `}</span>
+                            <Text
+                              value={host.logging.syslog_destination || ''}
+                              onChange={value =>
+                                setRemoteSyslogHost(host, value)
+                              }
+                            />
+                          </li>
+                        ))}
+                      </ul>
+                      <ActionRowButton
+                        btnStyle={editRemoteSyslog ? 'info' : 'primary'}
+                        handler={this.toggleState('editRemoteSyslog')}
+                        icon='edit'
+                      >
+                        {_('poolEditAll')}
+                      </ActionRowButton>
+                      {editRemoteSyslog && (
+                        <form
+                          id='formRemoteSyslog'
+                          className='form-inline mt-1'
+                        >
+                          <div className='form-group'>
+                            <input
+                              className='form-control'
+                              onChange={this.linkState('syslogDestination')}
+                              placeholder={this.props.intl.formatMessage(
+                                messages.poolRemoteSyslogPlaceHolder
+                              )}
+                              type='text'
+                              value={state.syslogDestination}
+                            />
+                          </div>
+                          <div className='form-group ml-1'>
+                            <ActionButton
+                              btnStyle='primary'
+                              form='formRemoteSyslog'
+                              handler={this._setRemoteSyslogHosts}
+                              icon='save'
+                            >
+                              {_('confirmOk')}
+                            </ActionButton>
+                          </div>
+                        </form>
+                      )}
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </Col>
+          </Row>
+        </Container>
+        <h3 className='mt-1 mb-1'>{_('poolGpuGroups')}</h3>
+        <Container>
+          <Row>
+            <Col size={9}>
+              <ul className='list-group'>
+                {map(gpuGroups, gpuGroup => (
+                  <li key={gpuGroup.id} className='list-group-item'>
+                    {renderXoItem(gpuGroup)}
+                  </li>
+                ))}
+              </ul>
+            </Col>
+          </Row>
+        </Container>
+        <h3 className='mt-1 mb-1'>{_('supplementalPackPoolNew')}</h3>
+        <Upgrade place='poolSupplementalPacks' required={2}>
+          <SelectFiles
+            onChange={file => installSupplementalPackOnAllHosts(pool, file)}
+          />
+        </Upgrade>
+      </div>
+    )
+  }
+}

packages/xo-web/src/xo-app/sr/tab-disks.js

@@ -78,13 +78,26 @@ const COLUMNS = [
         .sort()
       const getVmIds = createSelector(getVbds, vbds => map(vbds, 'VM'))
       const getVms = createGetObjectsOfType('VM').pick(getVmIds)
+      const getVmControllers = createGetObjectsOfType('VM-controller').pick(
+        getVmIds
+      )
       const getVmSnapshots = createGetObjectsOfType('VM-snapshot').pick(
         getVmIds
       )
+      const getVmTemplates = createGetObjectsOfType('VM-template').pick(
+        getVmIds
+      )
       const getAllVms = createSelector(
         getVms,
+        getVmControllers,
         getVmSnapshots,
-        (vms, vmSnapshots) => ({ ...vms, ...vmSnapshots })
+        getVmTemplates,
+        (vms, vmControllers, vmSnapshots, vmTemplates) => ({
+          ...vms,
+          ...vmControllers,
+          ...vmSnapshots,
+          ...vmTemplates,
+        })
       )
 
       return (state, props) => ({
@@ -105,12 +118,18 @@ const COLUMNS = [
               return null
             }
 
-            const link =
-              vm.type === 'VM'
-                ? `/vms/${vm.id}`
-                : vm.$snapshot_of === undefined
+            const type = vm.type
+            let link
+            if (type === 'VM') {
+              link = `/vms/${vm.id}`
+            } else if (type === 'VM-template') {
+              link = `/home?s=${vm.id}&t=VM-template`
+            } else {
+              link =
+                vm.$snapshot_of === undefined
                   ? '/dashboard/health'
                   : `/vms/${vm.$snapshot_of}/snapshots`
+            }
 
             return (
               <Row className={index > 0 && 'mt-1'}>

packages/xo-web/src/xo-app/vm-import/index.js

@@ -10,7 +10,6 @@ import map from 'lodash/map'
 import orderBy from 'lodash/orderBy'
 import propTypes from 'prop-types-decorator'
 import React from 'react'
-import Upgrade from 'xoa-upgrade'
 import { Container, Col, Row } from 'grid'
 import { importVms, isSrWritable } from 'xo'
 import { SizeInput } from 'form'
@@ -319,107 +318,101 @@ export default class Import extends Component {
 
     return (
       <Page header={HEADER} title='newImport' formatTitle>
-        {process.env.XOA_PLAN > 1 ? (
-          <Container>
-            <form id='import-form'>
-              <FormGrid.Row>
-                <FormGrid.LabelCol>{_('vmImportToPool')}</FormGrid.LabelCol>
-                <FormGrid.InputCol>
-                  <SelectPool
-                    value={pool}
-                    onChange={this._handleSelectedPool}
-                    required
-                  />
-                </FormGrid.InputCol>
-              </FormGrid.Row>
-              <FormGrid.Row>
-                <FormGrid.LabelCol>{_('vmImportToSr')}</FormGrid.LabelCol>
-                <FormGrid.InputCol>
-                  <SelectSr
-                    disabled={!pool}
-                    onChange={this._handleSelectedSr}
-                    predicate={srPredicate}
-                    required
-                    value={sr}
-                  />
-                </FormGrid.InputCol>
-              </FormGrid.Row>
-              {sr && (
-                <div>
-                  <Dropzone
-                    onDrop={this._handleDrop}
-                    message={_('importVmsList')}
-                  />
-                  <hr />
-                  <h5>{_('vmsToImport')}</h5>
-                  {vms.length > 0 ? (
-                    <div>
-                      {map(vms, ({ data, error, file, type }, vmIndex) => (
-                        <div key={file.preview} className={styles.vmContainer}>
-                          <strong>{file.name}</strong>
-                          <span className='pull-right'>
-                            <strong>{`(${formatSize(file.size)})`}</strong>
-                          </span>
-                          {!error ? (
-                            data && (
-                              <div>
-                                <hr />
-                                <div className='alert alert-info' role='alert'>
-                                  <strong>
-                                    {_('vmImportFileType', { type })}
-                                  </strong>{' '}
-                                  {_('vmImportConfigAlert')}
-                                </div>
-                                <VmData
-                                  {...data}
-                                  ref={`vm-data-${vmIndex}`}
-                                  pool={pool}
-                                />
-                              </div>
-                            )
-                          ) : (
+        <Container>
+          <form id='import-form'>
+            <FormGrid.Row>
+              <FormGrid.LabelCol>{_('vmImportToPool')}</FormGrid.LabelCol>
+              <FormGrid.InputCol>
+                <SelectPool
+                  value={pool}
+                  onChange={this._handleSelectedPool}
+                  required
+                />
+              </FormGrid.InputCol>
+            </FormGrid.Row>
+            <FormGrid.Row>
+              <FormGrid.LabelCol>{_('vmImportToSr')}</FormGrid.LabelCol>
+              <FormGrid.InputCol>
+                <SelectSr
+                  disabled={!pool}
+                  onChange={this._handleSelectedSr}
+                  predicate={srPredicate}
+                  required
+                  value={sr}
+                />
+              </FormGrid.InputCol>
+            </FormGrid.Row>
+            {sr && (
+              <div>
+                <Dropzone
+                  onDrop={this._handleDrop}
+                  message={_('importVmsList')}
+                />
+                <hr />
+                <h5>{_('vmsToImport')}</h5>
+                {vms.length > 0 ? (
+                  <div>
+                    {map(vms, ({ data, error, file, type }, vmIndex) => (
+                      <div key={file.preview} className={styles.vmContainer}>
+                        <strong>{file.name}</strong>
+                        <span className='pull-right'>
+                          <strong>{`(${formatSize(file.size)})`}</strong>
+                        </span>
+                        {!error ? (
+                          data && (
                             <div>
                               <hr />
-                              <div className='alert alert-danger' role='alert'>
-                                <strong>{_('vmImportError')}</strong>{' '}
-                                {(error && error.message) ||
-                                  _('noVmImportErrorDescription')}
+                              <div className='alert alert-info' role='alert'>
+                                <strong>
+                                  {_('vmImportFileType', { type })}
+                                </strong>{' '}
+                                {_('vmImportConfigAlert')}
                               </div>
+                              <VmData
+                                {...data}
+                                ref={`vm-data-${vmIndex}`}
+                                pool={pool}
+                              />
                             </div>
-                          )}
-                        </div>
-                      ))}
-                    </div>
-                  ) : (
-                    <p>{_('noSelectedVms')}</p>
-                  )}
-                  <hr />
-                  <div className='form-group pull-right'>
-                    <ActionButton
-                      btnStyle='primary'
-                      disabled={!vms.length}
-                      className='mr-1'
-                      form='import-form'
-                      handler={this._import}
-                      icon='import'
-                      redirectOnSuccess={getRedirectionUrl}
-                      type='submit'
-                    >
-                      {_('newImport')}
-                    </ActionButton>
-                    <Button onClick={this._handleCleanSelectedVms}>
-                      {_('importVmsCleanList')}
-                    </Button>
+                          )
+                        ) : (
+                          <div>
+                            <hr />
+                            <div className='alert alert-danger' role='alert'>
+                              <strong>{_('vmImportError')}</strong>{' '}
+                              {(error && error.message) ||
+                                _('noVmImportErrorDescription')}
+                            </div>
+                          </div>
+                        )}
+                      </div>
+                    ))}
                   </div>
+                ) : (
+                  <p>{_('noSelectedVms')}</p>
+                )}
+                <hr />
+                <div className='form-group pull-right'>
+                  <ActionButton
+                    btnStyle='primary'
+                    disabled={!vms.length}
+                    className='mr-1'
+                    form='import-form'
+                    handler={this._import}
+                    icon='import'
+                    redirectOnSuccess={getRedirectionUrl}
+                    type='submit'
+                  >
+                    {_('newImport')}
+                  </ActionButton>
+                  <Button onClick={this._handleCleanSelectedVms}>
+                    {_('importVmsCleanList')}
+                  </Button>
                 </div>
-              )}
-            </form>
-          </Container>
-        ) : (
-          <Container>
-            <Upgrade place='vmImport' available={2} />
-          </Container>
-        )}
+              </div>
+            )}
+          </form>
+        </Container>
       </Page>
     )
   }

packages/xo-web/src/xo-app/vm/tab-advanced.js

@@ -585,7 +585,9 @@ export default class TabAdvanced extends Component {
                 <tr>
                   <th>{_('xenToolsStatus')}</th>
                   <td>
-                    {vm.xenTools && `${vm.xenTools.major}.${vm.xenTools.minor}`}
+                    {vm.xenTools
+                      ? `${vm.xenTools.major}.${vm.xenTools.minor}`
+                      : _('xenToolsNotInstalled')}
                   </td>
                 </tr>
                 <tr>

packages/xo-web/src/xo-app/vm/tab-network.js

@@ -218,7 +218,6 @@ class VifAllowedIps extends BaseComponent {
                     containerPredicate={this._getIsNetworkAllowed()}
                     onChange={this._addIp}
                     predicate={this._getIpPredicate()}
-                    required
                     resourceSetId={resourceSet}
                   />
                 ) : (
@@ -227,7 +226,6 @@ class VifAllowedIps extends BaseComponent {
                     containerPredicate={this._getIsNetworkAllowed()}
                     onChange={this._addIp}
                     predicate={this._getIpPredicate()}
-                    required
                   />
                 )}
               </span>