Fallback to uname

@vates/fuse-vhd/package.json

@@ -22,7 +22,7 @@
     "fuse-native": "^2.2.6",
     "lru-cache": "^7.14.0",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.6.1"
+    "vhd-lib": "^4.5.0"
   },
   "scripts": {
     "postversion": "npm publish --access public"

@xen-orchestra/backups-cli/package.json

@@ -7,7 +7,7 @@
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "dependencies": {
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.43.0",
+    "@xen-orchestra/backups": "^0.42.0",
     "@xen-orchestra/fs": "^4.1.0",
     "filenamify": "^6.0.0",
     "getopts": "^2.2.5",
@@ -27,7 +27,7 @@
   "scripts": {
     "postversion": "npm publish --access public"
   },
-  "version": "1.0.13",
+  "version": "1.0.12",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Vates SAS",

@xen-orchestra/backups/ImportVmBackup.mjs

@@ -14,26 +14,7 @@ export class ImportVmBackup {
     this._xapi = xapi
   }
 
-  async #detectBaseVdis(){
-    const vmUuid = this._metadata.vm.uuid
-    const vm = await this._xapi.getRecordByUuid('VM', vmUuid)
-    const disks = vm.$getDisks()
-    const snapshots = {}
-    console.log({disks})
-    for (const disk of Object.values(disks)){
-      console.log({snapshots: disk.snapshots})
-      for(const snapshotRef of disk.snapshots){
-        
-        const snapshot = await this._xapi.getRecordByUuid('VDI', snapshotRef)
-        snapshots[snapshot.uuid] = disk.uuid
-      }
-    }
-    console.log({snapshots})
-    return snapshots
-  }
-
   async run() {
-    console.log('RUN')
     const adapter = this._adapter
     const metadata = this._metadata
     const isFull = metadata.mode === 'full'
@@ -41,23 +22,18 @@ export class ImportVmBackup {
     const sizeContainer = { size: 0 }
 
     let backup
-    
     if (isFull) {
       backup = await adapter.readFullVmBackup(metadata)
       watchStreamSize(backup, sizeContainer)
     } else {
-      console.log('restore delta')
       assert.strictEqual(metadata.mode, 'delta')
+
       const ignoredVdis = new Set(
         Object.entries(this._importIncrementalVmSettings.mapVdisSrs)
           .filter(([_, srUuid]) => srUuid === null)
           .map(([vdiUuid]) => vdiUuid)
       )
-      //const vdiSnap = await this._xapi.getRecord('VDI-snapshot','83c96977-9bc5-483d-b816-4c96622fb5e6') 
-      //console.log({vdiSnap})
-      const baseVdis = this.#detectBaseVdis()
-      backup = await adapter.readIncrementalVmBackup(metadata, ignoredVdis, { baseVdis })
-      
+      backup = await adapter.readIncrementalVmBackup(metadata, ignoredVdis)
       Object.values(backup.streams).forEach(stream => watchStreamSize(stream, sizeContainer))
     }
 
@@ -73,7 +49,7 @@ export class ImportVmBackup {
           ? await xapi.VM_import(backup, srRef)
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
               ...this._importIncrementalVmSettings,
-              baseVdis
+              detectBase: false,
             })
 
         await Promise.all([

@xen-orchestra/backups/RemoteAdapter.mjs

@@ -2,7 +2,7 @@ import { asyncEach } from '@vates/async-each'
 import { asyncMap, asyncMapSettled } from '@xen-orchestra/async-map'
 import { compose } from '@vates/compose'
 import { createLogger } from '@xen-orchestra/log'
-import { createVhdDirectoryFromStream, openVhd, VhdAbstract, VhdDirectory, VhdSynthetic ,Constants} from 'vhd-lib'
+import { createVhdDirectoryFromStream, openVhd, VhdAbstract, VhdDirectory, VhdSynthetic } from 'vhd-lib'
 import { decorateMethodsWith } from '@vates/decorate-with'
 import { deduped } from '@vates/disposable/deduped.js'
 import { dirname, join, resolve } from 'node:path'
@@ -694,8 +694,8 @@ export class RemoteAdapter {
     return container.size
   }
 
-  // open the  hierarchy of ancestors until we find a usable one
-  async _createVhdStream(handler, path, { useChain, snapshotedVdis }) {
+  // open the  hierarchy of ancestors until we find a full one
+  async _createVhdStream(handler, path, { useChain }) {
     const disposableSynthetic = useChain ? await VhdSynthetic.fromVhdChain(handler, path) : await openVhd(handler, path)
     // I don't want the vhds to be disposed on return
     // but only when the stream is done ( or failed )
@@ -713,67 +713,7 @@ export class RemoteAdapter {
     }
     const synthetic = disposableSynthetic.value
     await synthetic.readBlockAllocationTable()
-    let stream
-    // try to create a stream that will reuse any data already present on the host storage 
-    // by looking for an existing snapshot matching one of the vhd in the chain
-    // and transfer only the differential 
-    if (snapshotedVdis) {
-      try{
-
-        let vhdPaths = await handler.list(dirname(path), {filter: path=>path.endsWith('.vhd')})
-        stream = await Disposable.use(async function *(){
-          const vhdChilds = {}
-          const vhds = yield Disposable.all(vhdPaths.map(path => openVhd(handler, path, opts)))
-          for(const vhd of vhds){
-            vhdChilds[vhd.header.parentUuid] = vhdChilds[vhd.header.parentUuid] ?? []
-            vhdChilds[vhd.header.parentUuid].push(vhd)
-          } 
-  
-          let chain = []
-          let current = synthetic
-
-          // @todo : special case : we want to restore a vdi 
-          // that still have its snapshot => nothing to transfer
-
-          while(current != undefined){
-
-            // find the child VDI of path
-            const childs = vhdChilds[current.footer.uuid]
-  
-            //   more than one => break
-            //   inexistant => break
-            if(childs.length !== 1){
-              break
-            }
-            const child = childs[0]
-  
-            // not a differential => we won't have a list of block changed
-            // no need to continue looking
-            if(child.footer.diskType !== Constants.DISK_TYPES.DIFFERENCING){
-              break
-            }
-            // we have a snapshot
-            if(snapshotedVdis[current.footer.uuid] !== undefined){
-              const descendants = VhdSynthetic.open(handler)
-              negativeVhd = new NegativeVhd(synthetic, descendants)
-              return negative.stream()
-            } else {
-              // continue to look into the chain
-              // hoping we'll found a match deeper
-              current  = child 
-              chain.unshift(current)
-            }
-          }
-        })
-      }catch(error){
-        warn("error while trying to reuse a snapshot, fallback to legacy restore", {error})
-      }
-      
-    }
-    // fallback
-    if (stream === undefined) {
-      stream = await synthetic.stream()
-    }
+    const stream = await synthetic.stream()
 
     stream.on('end', disposeOnce)
     stream.on('close', disposeOnce)
@@ -781,7 +721,7 @@ export class RemoteAdapter {
     return stream
   }
 
-  async readIncrementalVmBackup(metadata, ignoredVdis, { useChain = true, snapshotedVdis } = {}) {
+  async readIncrementalVmBackup(metadata, ignoredVdis, { useChain = true } = {}) {
     const handler = this._handler
     const { vbds, vhds, vifs, vm, vmSnapshot } = metadata
     const dir = dirname(metadata._filename)
@@ -789,7 +729,7 @@ export class RemoteAdapter {
 
     const streams = {}
     await asyncMapSettled(Object.keys(vdis), async ref => {
-      streams[`${ref}.vhd`] = await this._createVhdStream(handler, join(dir, vhds[ref]), { useChain, snapshotedVdis })
+      streams[`${ref}.vhd`] = await this._createVhdStream(handler, join(dir, vhds[ref]), { useChain })
     })
 
     return {

@xen-orchestra/backups/_incrementalVm.mjs

@@ -143,38 +143,11 @@ export async function exportIncrementalVm(
   )
 }
 
-
-// @todo  movve this to incremental replication
-async function detectBaseVdis(vmRecord, sr) {
-  let baseVm
-  const xapi = sr.$xapi
-  const remoteBaseVmUuid = vmRecord.other_config[TAG_BASE_DELTA]
-  if (remoteBaseVmUuid) {
-    baseVm = find(
-      xapi.objects.all,
-      obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid && obj[TAG_BACKUP_SR] === sr.$id
-    )
-
-    if (!baseVm) {
-      throw new Error(`could not find the base VM (copy of ${remoteBaseVmUuid})`)
-    }
-  }
-  const baseVdis = {}
-  baseVm &&
-    baseVm.$VBDs.forEach(vbd => {
-      const vdi = vbd.$VDI
-      if (vdi !== undefined) {
-        baseVdis[vdi.other_config[TAG_COPY_SRC]] = vbd.$VDI
-      }
-    })
-  return baseVdis
-}
-
 export const importIncrementalVm = defer(async function importIncrementalVm(
   $defer,
   incrementalVm,
   sr,
-  { baseVdis = {}, cancelToken = CancelToken.none, detectBase = true, mapVdisSrs = {}, newMacAddresses = false } = {}
+  { cancelToken = CancelToken.none, detectBase = true, mapVdisSrs = {}, newMacAddresses = false } = {}
 ) {
   const { version } = incrementalVm
   if (compareVersions(version, '1.0.0') < 0) {
@@ -184,15 +157,35 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   const vmRecord = incrementalVm.vm
   const xapi = sr.$xapi
 
+  let baseVm
+  if (detectBase) {
+    const remoteBaseVmUuid = vmRecord.other_config[TAG_BASE_DELTA]
+    if (remoteBaseVmUuid) {
+      baseVm = find(
+        xapi.objects.all,
+        obj => (obj = obj.other_config) && obj[TAG_COPY_SRC] === remoteBaseVmUuid && obj[TAG_BACKUP_SR] === sr.$id
+      )
+
+      if (!baseVm) {
+        throw new Error(`could not find the base VM (copy of ${remoteBaseVmUuid})`)
+      }
+    }
+  }
+
   const cache = new Map()
   const mapVdisSrRefs = {}
   for (const [vdiUuid, srUuid] of Object.entries(mapVdisSrs)) {
     mapVdisSrRefs[vdiUuid] = await resolveUuid(xapi, cache, srUuid, 'SR')
   }
 
-  if (detectBase) {
-    baseVdis = await detectBaseVdis(vmRecord, sr)
-  }
+  const baseVdis = {}
+  baseVm &&
+    baseVm.$VBDs.forEach(vbd => {
+      const vdi = vbd.$VDI
+      if (vdi !== undefined) {
+        baseVdis[vbd.VDI] = vbd.$VDI
+      }
+    })
   const vdiRecords = incrementalVm.vdis
 
   // 0. Create suspend_VDI
@@ -256,11 +249,10 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
   await asyncMap(Object.keys(vdiRecords), async vdiRef => {
     const vdi = vdiRecords[vdiRef]
     let newVdi
-    // @todo how to rewrite this condition when giving directly a baseVdi  ?
+
     const remoteBaseVdiUuid = detectBase && vdi.other_config[TAG_BASE_DELTA]
     if (remoteBaseVdiUuid) {
-      const baseVdi = baseVdis[vdi.other_config[TAG_COPY_SRC]]
-      // @todo : should be an error only for detectBase
+      const baseVdi = find(baseVdis, vdi => vdi.other_config[TAG_COPY_SRC] === remoteBaseVdiUuid)
       if (!baseVdi) {
         throw new Error(`missing base VDI (copy of ${remoteBaseVdiUuid})`)
       }

@xen-orchestra/backups/_runners/_vmRunners/_AbstractXapi.mjs

@@ -31,11 +31,6 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       throw new Error('cannot backup a VM created by this very job')
     }
 
-    const currentOperations = Object.values(vm.current_operations)
-    if (currentOperations.some(_ => _ === 'migrate_send' || _ === 'pool_migrate')) {
-      throw new Error('cannot backup a VM currently being migrated')
-    }
-
     this.config = config
     this.job = job
     this.remoteAdapters = remoteAdapters
@@ -261,15 +256,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       }
 
       if (this._writers.size !== 0) {
-        const { pool_migrate = null, migrate_send = null } = this._exportedVm.blocked_operations
-
-        const reason = 'VM migration is blocked during backup'
-        await this._exportedVm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
-        try {
-          await this._copy()
-        } finally {
-          await this._exportedVm.update_blocked_operations({ pool_migrate, migrate_send })
-        }
+        await this._copy()
       }
     } finally {
       if (startAfter) {

@xen-orchestra/backups/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.43.0",
+  "version": "0.42.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -44,7 +44,7 @@
     "proper-lockfile": "^4.1.2",
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.6.1",
+    "vhd-lib": "^4.5.0",
     "xen-api": "^1.3.6",
     "yazl": "^2.5.1"
   },
@@ -56,7 +56,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^3.2.0"
+    "@xen-orchestra/xapi": "^3.1.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

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

@@ -624,18 +624,14 @@ export default class RemoteHandlerAbstract {
 
     const files = await this._list(dir)
     await asyncEach(files, file =>
-      this._unlink(`${dir}/${file}`).catch(
-        error => {
-          // Unlink dir behavior is not consistent across platforms
-          // https://github.com/nodejs/node-v0.x-archive/issues/5791
-          if (error.code === 'EISDIR' || error.code === 'EPERM') {
-            return this._rmtree(`${dir}/${file}`)
-          }
-          throw error
-        },
-       // real unlink concurrency will be 2**max directory depth 
-        { concurrency: 2 }
-      )
+      this._unlink(`${dir}/${file}`).catch(error => {
+        // Unlink dir behavior is not consistent across platforms
+        // https://github.com/nodejs/node-v0.x-archive/issues/5791
+        if (error.code === 'EISDIR' || error.code === 'EPERM') {
+          return this._rmtree(`${dir}/${file}`)
+        }
+        throw error
+      })
     )
     return this._rmtree(dir)
   }

@xen-orchestra/lite/CHANGELOG.md

@@ -2,14 +2,8 @@
 
 ## **next**
 
-- Ability to snapshot/copy a VM from its view (PR [#7087](https://github.com/vatesfr/xen-orchestra/pull/7087))
-
-## **0.1.4** (2023-10-03)
-
 - Ability to migrate selected VMs to another host (PR [#7040](https://github.com/vatesfr/xen-orchestra/pull/7040))
 - Ability to snapshot selected VMs (PR [#7021](https://github.com/vatesfr/xen-orchestra/pull/7021))
-- Add Patches to Pool Dashboard (PR [#6709](https://github.com/vatesfr/xen-orchestra/pull/6709))
-- Add remember me checkbox on the login page (PR [#7030](https://github.com/vatesfr/xen-orchestra/pull/7030))
 
 ## **0.1.3** (2023-09-01)
 

@xen-orchestra/lite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/lite",
-  "version": "0.1.4",
+  "version": "0.1.3",
   "scripts": {
     "dev": "GIT_HEAD=$(git rev-parse HEAD) vite",
     "build": "run-p type-check build-only",

@xen-orchestra/lite/src/assets/theme.css

@@ -59,8 +59,6 @@
 }
 
 :root.dark {
-  color-scheme: dark;
-
   --color-blue-scale-000: #ffffff;
   --color-blue-scale-100: #e5e5e7;
   --color-blue-scale-200: #9899a5;

@xen-orchestra/lite/src/components/AppLogin.vue

@@ -16,10 +16,6 @@
           required
         />
       </FormInputWrapper>
-      <label class="remember-me-label">
-        <FormCheckbox v-model="rememberMe" />
-        <p>{{ $t("keep-me-logged") }}</p>
-      </label>
       <UiButton type="submit" :busy="isConnecting">
         {{ $t("login") }}
       </UiButton>
@@ -32,9 +28,6 @@ import { usePageTitleStore } from "@/stores/page-title.store";
 import { storeToRefs } from "pinia";
 import { onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
-import { useLocalStorage } from "@vueuse/core";
-
-import FormCheckbox from "@/components/form/FormCheckbox.vue";
 import FormInput from "@/components/form/FormInput.vue";
 import FormInputWrapper from "@/components/form/FormInputWrapper.vue";
 import UiButton from "@/components/ui/UiButton.vue";
@@ -49,16 +42,12 @@ const password = ref("");
 const error = ref<string>();
 const passwordRef = ref<InstanceType<typeof FormInput>>();
 const isInvalidPassword = ref(false);
-const rememberMe = useLocalStorage("rememberMe", false);
 
 const focusPasswordInput = () => passwordRef.value?.focus();
 
 onMounted(() => {
-  if (rememberMe.value) {
-    xenApiStore.reconnect();
-  } else {
-    focusPasswordInput();
-  }
+  xenApiStore.reconnect();
+  focusPasswordInput();
 });
 
 watch(password, () => {
@@ -83,19 +72,6 @@ async function handleSubmit() {
 </script>
 
 <style lang="postcss" scoped>
-.remember-me-label {
-  cursor: pointer;
-  width: fit-content;
-  & .form-checkbox {
-    margin: 1rem 1rem 1rem 0;
-    vertical-align: middle;
-  }
-  & p {
-    display: inline;
-    vertical-align: middle;
-  }
-}
-
 .form-container {
   display: flex;
   align-items: center;
@@ -111,6 +87,7 @@ form {
   font-size: 2rem;
   min-width: 30em;
   max-width: 100%;
+  align-items: center;
   flex-direction: column;
   justify-content: center;
   margin: 0 auto;
@@ -127,7 +104,7 @@ h1 {
 
 img {
   width: 40rem;
-  margin: auto auto 5rem auto;
+  margin-bottom: 5rem;
 }
 
 input {
@@ -141,6 +118,6 @@ input {
 }
 
 button {
-  margin: 2rem auto;
+  margin-top: 2rem;
 }
 </style>

@xen-orchestra/lite/src/components/HostPatchesTable.vue

@@ -1,71 +0,0 @@
-<template>
-  <UiCardSpinner v-if="!areSomeLoaded" />
-  <UiTable v-else class="hosts-patches-table" :class="{ desktop: isDesktop }">
-    <tr v-for="patch in sortedPatches" :key="patch.$id">
-      <th>{{ patch.name }}</th>
-      <td>
-        <div class="version">
-          {{ patch.version }}
-          <template v-if="hasMultipleHosts">
-            <UiSpinner v-if="!areAllLoaded" />
-            <UiCounter
-              v-else
-              v-tooltip="{
-                placement: 'left',
-                content: $t('n-hosts-awaiting-patch', {
-                  n: patch.$hostRefs.size,
-                }),
-              }"
-              :value="patch.$hostRefs.size"
-              class="counter"
-              color="error"
-            />
-          </template>
-        </div>
-      </td>
-    </tr>
-  </UiTable>
-</template>
-
-<script lang="ts" setup>
-import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
-import UiCounter from "@/components/ui/UiCounter.vue";
-import UiSpinner from "@/components/ui/UiSpinner.vue";
-import UiTable from "@/components/ui/UiTable.vue";
-import type { XenApiPatchWithHostRefs } from "@/composables/host-patches.composable";
-import { vTooltip } from "@/directives/tooltip.directive";
-import { useUiStore } from "@/stores/ui.store";
-import { computed } from "vue";
-
-const props = defineProps<{
-  patches: XenApiPatchWithHostRefs[];
-  hasMultipleHosts: boolean;
-  areAllLoaded: boolean;
-  areSomeLoaded: boolean;
-}>();
-
-const sortedPatches = computed(() =>
-  [...props.patches].sort(
-    (patch1, patch2) => patch1.changelog.date - patch2.changelog.date
-  )
-);
-
-const { isDesktop } = useUiStore();
-</script>
-
-<style lang="postcss" scoped>
-.hosts-patches-table.desktop {
-  max-width: 45rem;
-}
-
-.version {
-  display: flex;
-  gap: 1rem;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-.counter {
-  font-size: 1rem;
-}
-</style>

@xen-orchestra/lite/src/components/charts/LinearChart.md

@@ -2,7 +2,12 @@
 
 ```vue
 <template>
-  <LinearChart :data="data" :value-formatter="customValueFormatter" />
+  <LinearChart
+    title="Chart title"
+    subtitle="Chart subtitle"
+    :data="data"
+    :value-formatter="customValueFormatter"
+  />
 </template>
 
 <script lang="ts" setup>

@xen-orchestra/lite/src/components/charts/LinearChart.vue

@@ -1,8 +1,12 @@
 <template>
-  <VueCharts :option="option" autoresize class="chart" />
+  <UiCard class="linear-chart">
+    <VueCharts :option="option" autoresize class="chart" />
+    <slot name="summary" />
+  </UiCard>
 </template>
 
 <script lang="ts" setup>
+import UiCard from "@/components/ui/UiCard.vue";
 import type { LinearChartData, ValueFormatter } from "@/types/chart";
 import { IK_CHART_VALUE_FORMATTER } from "@/types/injection-keys";
 import { utcFormat } from "d3-time-format";
@@ -11,6 +15,7 @@ import { LineChart } from "echarts/charts";
 import {
   GridComponent,
   LegendComponent,
+  TitleComponent,
   TooltipComponent,
 } from "echarts/components";
 import { use } from "echarts/core";
@@ -21,6 +26,8 @@ import VueCharts from "vue-echarts";
 const Y_AXIS_MAX_VALUE = 200;
 
 const props = defineProps<{
+  title?: string;
+  subtitle?: string;
   data: LinearChartData;
   valueFormatter?: ValueFormatter;
   maxValue?: number;
@@ -45,10 +52,15 @@ use([
   LineChart,
   GridComponent,
   TooltipComponent,
+  TitleComponent,
   LegendComponent,
 ]);
 
 const option = computed<EChartsOption>(() => ({
+  title: {
+    text: props.title,
+    subtext: props.subtitle,
+  },
   legend: {
     data: props.data.map((series) => series.label),
   },

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardHostsPatches.vue

@@ -1,41 +0,0 @@
-<template>
-  <UiCard>
-    <UiCardTitle class="patches-title">
-      {{ $t("patches") }}
-      <template v-if="areAllLoaded" #right>
-        {{ $t("n-missing", { n: count }) }}
-      </template>
-    </UiCardTitle>
-    <div class="table-container">
-      <HostPatches
-        :are-all-loaded="areAllLoaded"
-        :are-some-loaded="areSomeLoaded"
-        :has-multiple-hosts="hosts.length > 1"
-        :patches="patches"
-      />
-    </div>
-  </UiCard>
-</template>
-
-<script lang="ts" setup>
-import HostPatches from "@/components/HostPatchesTable.vue";
-import UiCard from "@/components/ui/UiCard.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { useHostPatches } from "@/composables/host-patches.composable";
-import { useHostCollection } from "@/stores/xen-api/host.store";
-
-const { records: hosts } = useHostCollection();
-
-const { count, patches, areSomeLoaded, areAllLoaded } = useHostPatches(hosts);
-</script>
-
-<style lang="postcss" scoped>
-.patches-title {
-  --section-title-right-color: var(--color-red-vates-base);
-}
-
-.table-container {
-  max-height: 40rem;
-  overflow: auto;
-}
-</style>

@xen-orchestra/lite/src/components/pool/dashboard/PoolDashboardNetworkChart.vue

@@ -1,44 +1,33 @@
 <template>
-  <UiCard class="linear-chart" :color="hasError ? 'error' : undefined">
-    <UiCardTitle>{{ $t("network-throughput") }}</UiCardTitle>
-    <UiCardTitle :level="UiCardTitleLevel.Subtitle">
-      {{ $t("last-week") }}
-    </UiCardTitle>
-    <NoDataError v-if="hasError" />
-    <UiCardSpinner v-else-if="isLoading" />
-    <LinearChart
-      v-else
-      :data="data"
-      :max-value="customMaxValue"
-      :value-formatter="customValueFormatter"
-    />
-  </UiCard>
+  <!-- TODO: add a loader when data is not fully loaded or undefined -->
+  <!-- TODO: add small loader with tooltips when stats can be expired -->
+  <!-- TODO: display the NoData component in case of a data recovery error -->
+  <LinearChart
+    :data="data"
+    :max-value="customMaxValue"
+    :subtitle="$t('last-week')"
+    :title="$t('network-throughput')"
+    :value-formatter="customValueFormatter"
+  />
 </template>
 
 <script lang="ts" setup>
+import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
 import { computed, defineAsyncComponent, inject } from "vue";
+import { map } from "lodash-es";
+import { useI18n } from "vue-i18n";
 import { formatSize } from "@/libs/utils";
 import type { HostStats } from "@/libs/xapi-stats";
-import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
 import type { LinearChartData } from "@/types/chart";
-import { map } from "lodash-es";
-import NoDataError from "@/components/NoDataError.vue";
 import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
-import UiCard from "@/components/ui/UiCard.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
-import { UiCardTitleLevel } from "@/types/enums";
-import { useHostCollection } from "@/stores/xen-api/host.store";
-import { useI18n } from "vue-i18n";
-
-const { t } = useI18n();
 
 const LinearChart = defineAsyncComponent(
   () => import("@/components/charts/LinearChart.vue")
 );
 
+const { t } = useI18n();
+
 const hostLastWeekStats = inject(IK_HOST_LAST_WEEK_STATS);
-const { hasError, isFetching } = useHostCollection();
 
 const data = computed<LinearChartData>(() => {
   const stats = hostLastWeekStats?.stats?.value;
@@ -93,25 +82,6 @@ const data = computed<LinearChartData>(() => {
   ];
 });
 
-const isStatFetched = computed(() => {
-  const stats = hostLastWeekStats?.stats?.value;
-  if (stats === undefined) {
-    return false;
-  }
-
-  return stats.every((host) => {
-    const hostStats = host.stats;
-    return (
-      hostStats != null &&
-      Object.values(hostStats.pifs["rx"])[0].length +
-        Object.values(hostStats.pifs["tx"])[0].length ===
-        data.value[0].data.length + data.value[1].data.length
-    );
-  });
-});
-
-const isLoading = computed(() => isFetching.value || !isStatFetched.value);
-
 // TODO: improve the way to get the max value of graph
 // See: https://github.com/vatesfr/xen-orchestra/pull/6610/files#r1072237279
 const customMaxValue = computed(

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/HostsCpuUsage.vue

@@ -1,23 +1,22 @@
 <template>
   <UiCardTitle
-    :level="UiCardTitleLevel.SubtitleWithUnderline"
     :left="$t('hosts')"
     :right="$t('top-#', { n: N_ITEMS })"
+    subtitle
   />
   <NoDataError v-if="hasError" />
   <UsageBar v-else :data="statFetched ? data : undefined" :n-items="N_ITEMS" />
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, type ComputedRef } from "vue";
+import NoDataError from "@/components/NoDataError.vue";
+import UiCardTitle from "@/components/ui/UiCardTitle.vue";
+import UsageBar from "@/components/UsageBar.vue";
+import { useHostCollection } from "@/stores/xen-api/host.store";
 import { getAvgCpuUsage } from "@/libs/utils";
 import { IK_HOST_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
-import NoDataError from "@/components/NoDataError.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { UiCardTitleLevel } from "@/types/enums";
-import UsageBar from "@/components/UsageBar.vue";
-import { useHostCollection } from "@/stores/xen-api/host.store";
+import { computed, type ComputedRef, inject } from "vue";
 
 const { hasError } = useHostCollection();
 

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/PoolCpuUsageChart.vue

@@ -1,33 +1,24 @@
 <template>
-  <UiCard class="linear-chart" :color="hasError ? 'error' : undefined">
-    <UiCardTitle>{{ $t("pool-cpu-usage") }}</UiCardTitle>
-    <UiCardTitle :level="UiCardTitleLevel.Subtitle">
-      {{ $t("last-week") }}
-    </UiCardTitle>
-    <NoDataError v-if="hasError" />
-    <UiCardSpinner v-else-if="isLoading" />
-    <LinearChart
-      v-else
-      :data="data"
-      :max-value="customMaxValue"
-      :value-formatter="customValueFormatter"
-    />
-  </UiCard>
+  <!-- TODO: add a loader when data is not fully loaded or undefined -->
+  <!-- TODO: add small loader with tooltips when stats can be expired -->
+  <!-- TODO: Display the NoDataError component in case of a data recovery error -->
+  <LinearChart
+    :data="data"
+    :max-value="customMaxValue"
+    :subtitle="$t('last-week')"
+    :title="$t('pool-cpu-usage')"
+    :value-formatter="customValueFormatter"
+  />
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, inject } from "vue";
-import type { HostStats } from "@/libs/xapi-stats";
-import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
-import type { LinearChartData, ValueFormatter } from "@/types/chart";
-import NoDataError from "@/components/NoDataError.vue";
-import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
-import { sumBy } from "lodash-es";
-import UiCard from "@/components/ui/UiCard.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
-import { UiCardTitleLevel } from "@/types/enums";
 import { useHostCollection } from "@/stores/xen-api/host.store";
+import type { HostStats } from "@/libs/xapi-stats";
+import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
+import type { LinearChartData, ValueFormatter } from "@/types/chart";
+import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
+import { sumBy } from "lodash-es";
+import { computed, defineAsyncComponent, inject } from "vue";
 import { useI18n } from "vue-i18n";
 
 const LinearChart = defineAsyncComponent(
@@ -38,7 +29,8 @@ const { t } = useI18n();
 
 const hostLastWeekStats = inject(IK_HOST_LAST_WEEK_STATS);
 
-const { records: hosts, isFetching, hasError } = useHostCollection();
+const { records: hosts } = useHostCollection();
+
 const customMaxValue = computed(
   () => 100 * sumBy(hosts.value, (host) => +host.cpu_info.cpu_count)
 );
@@ -87,22 +79,6 @@ const data = computed<LinearChartData>(() => {
     },
   ];
 });
-const isStatFetched = computed(() => {
-  const stats = hostLastWeekStats?.stats?.value;
-  if (stats === undefined) {
-    return false;
-  }
-
-  return stats.every((host) => {
-    const hostStats = host.stats;
-    return (
-      hostStats != null &&
-      Object.values(hostStats.cpus)[0].length === data.value[0].data.length
-    );
-  });
-});
-
-const isLoading = computed(() => isFetching.value || !isStatFetched.value);
 
 const customValueFormatter: ValueFormatter = (value) => `${value}%`;
 </script>

@xen-orchestra/lite/src/components/pool/dashboard/cpuUsage/VmsCpuUsage.vue

@@ -1,6 +1,6 @@
 <template>
   <UiCardTitle
-    :level="UiCardTitleLevel.SubtitleWithUnderline"
+    subtitle
     :left="$t('vms')"
     :right="$t('top-#', { n: N_ITEMS })"
   />
@@ -9,7 +9,6 @@
 </template>
 
 <script lang="ts" setup>
-import { type ComputedRef, computed, inject } from "vue";
 import NoDataError from "@/components/NoDataError.vue";
 import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import UsageBar from "@/components/UsageBar.vue";
@@ -17,7 +16,7 @@ import { useVmCollection } from "@/stores/xen-api/vm.store";
 import { getAvgCpuUsage } from "@/libs/utils";
 import { IK_VM_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
-import { UiCardTitleLevel } from "@/types/enums";
+import { computed, type ComputedRef, inject } from "vue";
 
 const { hasError } = useVmCollection();
 

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/HostsRamUsage.vue

@@ -1,6 +1,6 @@
 <template>
   <UiCardTitle
-    :level="UiCardTitleLevel.SubtitleWithUnderline"
+    subtitle
     :left="$t('hosts')"
     :right="$t('top-#', { n: N_ITEMS })"
   />
@@ -13,7 +13,6 @@ import UiCardTitle from "@/components/ui/UiCardTitle.vue";
 import { useHostCollection } from "@/stores/xen-api/host.store";
 import { IK_HOST_STATS } from "@/types/injection-keys";
 import { type ComputedRef, computed, inject } from "vue";
-import { UiCardTitleLevel } from "@/types/enums";
 import UsageBar from "@/components/UsageBar.vue";
 import { formatSize, parseRamUsage } from "@/libs/utils";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/PoolRamUsage.vue

@@ -1,43 +1,37 @@
 <template>
-  <UiCard class="linear-chart" :color="hasError ? 'error' : undefined">
-    <UiCardTitle>{{ $t("pool-ram-usage") }}</UiCardTitle>
-    <UiCardTitle :level="UiCardTitleLevel.Subtitle">
-      {{ $t("last-week") }}
-    </UiCardTitle>
-    <NoDataError v-if="hasError" />
-    <UiCardSpinner v-else-if="isLoading" />
-    <LinearChart
-      v-else
-      :data="data"
-      :max-value="customMaxValue"
-      :value-formatter="customValueFormatter"
-    />
-    <SizeStatsSummary :size="currentData.size" :usage="currentData.usage" />
-  </UiCard>
+  <!-- TODO: add a loader when data is not fully loaded or undefined -->
+  <!-- TODO: add small loader with tooltips when stats can be expired -->
+  <!-- TODO: display the NoDataError component in case of a data recovery error -->
+  <LinearChart
+    :data="data"
+    :max-value="customMaxValue"
+    :subtitle="$t('last-week')"
+    :title="$t('pool-ram-usage')"
+    :value-formatter="customValueFormatter"
+  >
+    <template #summary>
+      <SizeStatsSummary :size="currentData.size" :usage="currentData.usage" />
+    </template>
+  </LinearChart>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, inject } from "vue";
-import { formatSize } from "@/libs/utils";
-import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
-import type { LinearChartData } from "@/types/chart";
-import NoDataError from "@/components/NoDataError.vue";
-import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
 import SizeStatsSummary from "@/components/ui/SizeStatsSummary.vue";
-import { sumBy } from "lodash-es";
-import UiCard from "@/components/ui/UiCard.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import UiCardSpinner from "@/components/ui/UiCardSpinner.vue";
-import { UiCardTitleLevel } from "@/types/enums";
 import { useHostCollection } from "@/stores/xen-api/host.store";
 import { useHostMetricsCollection } from "@/stores/xen-api/host-metrics.store";
+import { formatSize } from "@/libs/utils";
+import { RRD_STEP_FROM_STRING } from "@/libs/xapi-stats";
+import type { LinearChartData, ValueFormatter } from "@/types/chart";
+import { IK_HOST_LAST_WEEK_STATS } from "@/types/injection-keys";
+import { sumBy } from "lodash-es";
+import { computed, defineAsyncComponent, inject } from "vue";
 import { useI18n } from "vue-i18n";
 
 const LinearChart = defineAsyncComponent(
   () => import("@/components/charts/LinearChart.vue")
 );
 
-const { runningHosts, isFetching, hasError } = useHostCollection();
+const { runningHosts } = useHostCollection();
 const { getHostMemory } = useHostMetricsCollection();
 
 const { t } = useI18n();
@@ -98,23 +92,6 @@ const data = computed<LinearChartData>(() => {
   ];
 });
 
-const isStatFetched = computed(() => {
-  const stats = hostLastWeekStats?.stats?.value;
-  if (stats === undefined) {
-    return false;
-  }
-
-  return stats.every((host) => {
-    const hostStats = host.stats;
-    return (
-      hostStats != null && hostStats.memory.length === data.value[0].data.length
-    );
-  });
-});
-
-const isLoading = computed(
-  () => (isFetching.value && !hasError.value) || !isStatFetched.value
-);
-
-const customValueFormatter = (value: number) => String(formatSize(value));
+const customValueFormatter: ValueFormatter = (value) =>
+  String(formatSize(value));
 </script>

@xen-orchestra/lite/src/components/pool/dashboard/ramUsage/VmsRamUsage.vue

@@ -1,6 +1,6 @@
 <template>
   <UiCardTitle
-    :level="UiCardTitleLevel.SubtitleWithUnderline"
+    subtitle
     :left="$t('vms')"
     :right="$t('top-#', { n: N_ITEMS })"
   />
@@ -9,15 +9,14 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, type ComputedRef } from "vue";
+import NoDataError from "@/components/NoDataError.vue";
+import UiCardTitle from "@/components/ui/UiCardTitle.vue";
+import UsageBar from "@/components/UsageBar.vue";
+import { useVmCollection } from "@/stores/xen-api/vm.store";
 import { formatSize, parseRamUsage } from "@/libs/utils";
 import { IK_VM_STATS } from "@/types/injection-keys";
 import { N_ITEMS } from "@/views/pool/PoolDashboardView.vue";
-import NoDataError from "@/components/NoDataError.vue";
-import UiCardTitle from "@/components/ui/UiCardTitle.vue";
-import { UiCardTitleLevel } from "@/types/enums";
-import UsageBar from "@/components/UsageBar.vue";
-import { useVmCollection } from "@/stores/xen-api/vm.store";
+import { computed, type ComputedRef, inject } from "vue";
 
 const { hasError } = useVmCollection();
 

@xen-orchestra/lite/src/components/ui/UiCardTitle.vue

@@ -1,40 +1,35 @@
 <template>
-  <div :class="['ui-section-title', tags.left]">
-    <component :is="tags.left" v-if="$slots.default || left" class="left">
+  <div :class="{ subtitle }" class="ui-section-title">
+    <component
+      :is="subtitle ? 'h5' : 'h4'"
+      v-if="$slots.default || left"
+      class="left"
+    >
       <slot>{{ left }}</slot>
       <UiCounter class="count" v-if="count > 0" :value="count" color="info" />
     </component>
-    <component :is="tags.right" v-if="$slots.right || right" class="right">
+    <component
+      :is="subtitle ? 'h6' : 'h5'"
+      v-if="$slots.right || right"
+      class="right"
+    >
       <slot name="right">{{ right }}</slot>
     </component>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
 import UiCounter from "@/components/ui/UiCounter.vue";
-import { UiCardTitleLevel } from "@/types/enums";
 
-const props = withDefaults(
+withDefaults(
   defineProps<{
-    count?: number;
-    level?: UiCardTitleLevel;
+    subtitle?: boolean;
     left?: string;
     right?: string;
+    count?: number;
   }>(),
-  { count: 0, level: UiCardTitleLevel.Title }
+  { count: 0 }
 );
-
-const tags = computed(() => {
-  switch (props.level) {
-    case UiCardTitleLevel.Subtitle:
-      return { left: "h6", right: "h6" };
-    case UiCardTitleLevel.SubtitleWithUnderline:
-      return { left: "h5", right: "h6" };
-    default:
-      return { left: "h4", right: "h5" };
-  }
-});
 </script>
 
 <style lang="postcss" scoped>
@@ -42,6 +37,7 @@ const tags = computed(() => {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 2rem;
 
   --section-title-left-size: 2rem;
   --section-title-left-color: var(--color-blue-scale-100);
@@ -50,17 +46,9 @@ const tags = computed(() => {
   --section-title-right-color: var(--color-extra-blue-base);
   --section-title-right-weight: 700;
 
-  &.h6 {
-    margin-bottom: 1rem;
-    --section-title-left-size: 1.5rem;
-    --section-title-left-color: var(--color-blue-scale-300);
-    --section-title-left-weight: 400;
-  }
-
-  &.h5 {
-    margin-top: 2rem;
-    margin-bottom: 1rem;
+  &.subtitle {
     border-bottom: 1px solid var(--color-extra-blue-base);
+
     --section-title-left-size: 1.6rem;
     --section-title-left-color: var(--color-extra-blue-base);
     --section-title-left-weight: 700;

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionCopyItem.vue

@@ -1,9 +1,6 @@
 <template>
   <MenuItem
-    v-tooltip="
-      !areAllSelectedVmsHalted &&
-      $t(isSingleAction ? 'vm-is-running' : 'selected-vms-in-execution')
-    "
+    v-tooltip="!areAllSelectedVmsHalted && $t('selected-vms-in-execution')"
     :busy="areSomeSelectedVmsCloning"
     :disabled="isDisabled"
     :icon="faCopy"
@@ -25,7 +22,6 @@ import { computed } from "vue";
 
 const props = defineProps<{
   selectedRefs: XenApiVm["$ref"][];
-  isSingleAction?: boolean;
 }>();
 
 const { getByOpaqueRef, isOperationPending } = useVmCollection();

@xen-orchestra/lite/src/components/vm/VmActionItems/VmActionSnapshotItem.vue

@@ -34,9 +34,7 @@ const areSomeVmsSnapshoting = computed(() =>
   vms.value.some((vm) => isOperationPending(vm, VM_OPERATION.SNAPSHOT))
 );
 
-const isDisabled = computed(
-  () => vms.value.length === 0 || areSomeVmsSnapshoting.value
-);
+const isDisabled = computed(() => vms.value.length === 0 || areSomeVmsSnapshoting.value);
 
 const handleSnapshot = () => {
   const vmRefsToSnapshot = Object.fromEntries(

@xen-orchestra/lite/src/components/vm/VmHeader.vue

@@ -11,23 +11,6 @@
         </template>
         <VmActionPowerStateItems :vm-refs="[vm.$ref]" />
       </AppMenu>
-      <AppMenu v-if="vm !== undefined" placement="bottom-end" shadow>
-        <template #trigger="{ open, isOpen }">
-          <UiButton
-            :active="isOpen"
-            :icon="faEllipsisVertical"
-            @click="open"
-            transparent
-            class="more-actions-button"
-            v-tooltip="{
-              placement: 'left',
-              content: $t('more-actions'),
-            }"
-          />
-        </template>
-        <VmActionCopyItem :selected-refs="[vm.$ref]" is-single-action />
-        <VmActionSnapshotItem :vm-refs="[vm.$ref]" />
-      </AppMenu>
     </template>
   </TitleBar>
 </template>
@@ -38,15 +21,11 @@ import TitleBar from "@/components/TitleBar.vue";
 import UiIcon from "@/components/ui/icon/UiIcon.vue";
 import UiButton from "@/components/ui/UiButton.vue";
 import VmActionPowerStateItems from "@/components/vm/VmActionItems/VmActionPowerStateItems.vue";
-import VmActionSnapshotItem from "@/components/vm/VmActionItems/VmActionSnapshotItem.vue";
-import VmActionCopyItem from "@/components/vm/VmActionItems/VmActionCopyItem.vue";
 import { useVmCollection } from "@/stores/xen-api/vm.store";
-import { vTooltip } from "@/directives/tooltip.directive";
 import type { XenApiVm } from "@/libs/xen-api/xen-api.types";
 import {
   faAngleDown,
   faDisplay,
-  faEllipsisVertical,
   faPowerOff,
 } from "@fortawesome/free-solid-svg-icons";
 import { computed } from "vue";
@@ -61,9 +40,3 @@ const vm = computed(() =>
 
 const name = computed(() => vm.value?.name_label);
 </script>
-
-<style lang="postcss">
-.more-actions-button {
-  font-size: 1.2em;
-}
-</style>

@xen-orchestra/lite/src/composables/chart-theme.composable.ts

@@ -10,7 +10,8 @@ export const useChartTheme = () => {
 
   const getColors = () => ({
     background: style.getPropertyValue("--background-color-primary"),
-    text: style.getPropertyValue("--color-blue-scale-300"),
+    title: style.getPropertyValue("--color-blue-scale-100"),
+    subtitle: style.getPropertyValue("--color-blue-scale-300"),
     splitLine: style.getPropertyValue("--color-blue-scale-400"),
     primary: style.getPropertyValue("--color-extra-blue-base"),
     secondary: style.getPropertyValue("--color-orange-world-base"),
@@ -27,10 +28,24 @@ export const useChartTheme = () => {
       backgroundColor: colors.value.background,
       textStyle: {},
       grid: {
-        top: 40,
+        top: 80,
         left: 80,
         right: 20,
       },
+      title: {
+        textStyle: {
+          color: colors.value.title,
+          fontFamily: "Poppins, sans-serif",
+          fontWeight: 500,
+          fontSize: 20,
+        },
+        subtextStyle: {
+          color: colors.value.subtitle,
+          fontFamily: "Poppins, sans-serif",
+          fontWeight: 400,
+          fontSize: 14,
+        },
+      },
       line: {
         itemStyle: {
           borderWidth: 2,
@@ -220,7 +235,7 @@ export const useChartTheme = () => {
         },
         axisLabel: {
           show: true,
-          color: colors.value.text,
+          color: colors.value.subtitle,
         },
         splitLine: {
           show: true,
@@ -280,7 +295,7 @@ export const useChartTheme = () => {
         },
         axisLabel: {
           show: true,
-          color: colors.value.text,
+          color: colors.value.subtitle,
         },
         splitLine: {
           show: true,
@@ -310,7 +325,7 @@ export const useChartTheme = () => {
         left: "right",
         top: "bottom",
         textStyle: {
-          color: colors.value.text,
+          color: colors.value.subtitle,
         },
       },
       tooltip: {

@xen-orchestra/lite/src/composables/host-patches.composable.ts

@@ -1,95 +0,0 @@
-import type { XenApiHost } from "@/libs/xen-api/xen-api.types";
-import { useHostStore } from "@/stores/xen-api/host.store";
-import type { XenApiPatch } from "@/types/xen-api";
-import { type Pausable, useTimeoutPoll, watchArray } from "@vueuse/core";
-import { computed, type MaybeRefOrGetter, reactive, toValue } from "vue";
-
-export type XenApiPatchWithHostRefs = XenApiPatch & { $hostRefs: Set<string> };
-
-type HostConfig = {
-  timeoutPoll: Pausable;
-  patches: XenApiPatch[];
-  isLoaded: boolean;
-};
-
-export const useHostPatches = (hosts: MaybeRefOrGetter<XenApiHost[]>) => {
-  const hostStore = useHostStore();
-
-  const configByHost = reactive(new Map<string, HostConfig>());
-
-  const fetchHostPatches = async (hostRef: XenApiHost["$ref"]) => {
-    if (!configByHost.has(hostRef)) {
-      return;
-    }
-
-    const config = configByHost.get(hostRef)!;
-
-    config.patches = await hostStore.fetchMissingPatches(hostRef);
-    config.isLoaded = true;
-  };
-
-  const registerHost = (hostRef: XenApiHost["$ref"]) => {
-    if (configByHost.has(hostRef)) {
-      return;
-    }
-
-    const timeoutPoll = useTimeoutPoll(() => fetchHostPatches(hostRef), 10000, {
-      immediate: true,
-    });
-
-    configByHost.set(hostRef, {
-      timeoutPoll,
-      patches: [],
-      isLoaded: false,
-    });
-  };
-
-  const unregisterHost = (hostRef: string) => {
-    configByHost.get(hostRef)?.timeoutPoll.pause();
-    configByHost.delete(hostRef);
-  };
-
-  watchArray(
-    () => toValue(hosts).map((host) => host.$ref),
-    (_n, _p, addedRefs, removedRefs) => {
-      addedRefs.forEach((ref) => registerHost(ref));
-      removedRefs?.forEach((ref) => unregisterHost(ref));
-    },
-    { immediate: true }
-  );
-
-  const patches = computed(() => {
-    const records = new Map<string, XenApiPatchWithHostRefs>();
-
-    configByHost.forEach(({ patches }, hostRef) => {
-      patches.forEach((patch) => {
-        const record = records.get(patch.$id);
-
-        if (record !== undefined) {
-          return record.$hostRefs.add(hostRef);
-        }
-
-        records.set(patch.$id, {
-          ...patch,
-          $hostRefs: new Set([hostRef]),
-        });
-      });
-    });
-
-    return Array.from(records.values());
-  });
-
-  const count = computed(() => patches.value.length);
-
-  const areAllLoaded = computed(() =>
-    Array.from(configByHost.values()).every((config) => config.isLoaded)
-  );
-
-  const areSomeLoaded = computed(
-    () =>
-      areAllLoaded.value ||
-      Array.from(configByHost.values()).some((config) => config.isLoaded)
-  );
-
-  return { patches, count, areAllLoaded, areSomeLoaded };
-};

@xen-orchestra/lite/src/libs/xen-api/xen-api.types.ts

@@ -621,7 +621,7 @@ export interface XenApiBond extends XenApiRecord<"bond"> {
 
 export type XenApiEvent<
   RelationType extends ObjectType,
-  XRecord extends ObjectTypeToRecord<RelationType>,
+  XRecord extends ObjectTypeToRecord<RelationType>
 > = {
   id: string;
   class: RelationType;

@xen-orchestra/lite/src/locales/en.json

@@ -78,7 +78,6 @@
   "go-back": "Go back",
   "here": "Here",
   "hosts": "Hosts",
-  "keep-me-logged": "Keep me logged in",
   "language": "Language",
   "last-week": "Last week",
   "learn-more": "Learn more",
@@ -86,11 +85,8 @@
   "loading-hosts": "Loading hosts…",
   "log-out": "Log out",
   "login": "Login",
-  "more-actions": "More actions",
   "migrate": "Migrate",
   "migrate-n-vms": "Migrate 1 VM | Migrate {n} VMs",
-  "n-hosts-awaiting-patch": "{n} host is awaiting this patch | {n} hosts are awaiting this patch",
-  "n-missing": "{n} missing",
   "n-vms": "1 VM | {n} VMs",
   "name": "Name",
   "network": "Network",
@@ -111,7 +107,6 @@
   "page-not-found": "This page is not to be found…",
   "password": "Password",
   "password-invalid": "Password invalid",
-  "patches": "Patches",
   "pause": "Pause",
   "please-confirm": "Please confirm",
   "pool-cpu-usage": "Pool CPU Usage",
@@ -174,7 +169,6 @@
   "vcpus": "vCPUs",
   "vcpus-used": "vCPUs used",
   "version": "Version",
-  "vm-is-running": "The VM is running",
   "vms": "VMs",
   "xo-lite-under-construction": "XOLite is under construction"
 }

@xen-orchestra/lite/src/locales/fr.json

@@ -78,7 +78,6 @@
   "go-back": "Revenir en arrière",
   "here": "Ici",
   "hosts": "Hôtes",
-  "keep-me-logged": "Rester connecté",
   "language": "Langue",
   "last-week": "Semaine dernière",
   "learn-more": "En savoir plus",
@@ -86,11 +85,8 @@
   "loading-hosts": "Chargement des hôtes…",
   "log-out": "Se déconnecter",
   "login": "Connexion",
-  "more-actions": "Plus d'actions",
   "migrate": "Migrer",
   "migrate-n-vms": "Migrer 1 VM | Migrer {n} VMs",
-  "n-hosts-awaiting-patch": "{n} hôte attend ce patch | {n} hôtes attendent ce patch",
-  "n-missing": "{n} manquant | {n} manquants",
   "n-vms": "1 VM | {n} VMs",
   "name": "Nom",
   "network": "Réseau",
@@ -111,7 +107,6 @@
   "page-not-found": "Cette page est introuvable…",
   "password": "Mot de passe",
   "password-invalid": "Mot de passe incorrect",
-  "patches": "Patches",
   "pause": "Pause",
   "please-confirm": "Veuillez confirmer",
   "pool-cpu-usage": "Utilisation CPU du Pool",
@@ -174,7 +169,6 @@
   "vcpus": "vCPUs",
   "vcpus-used": "vCPUs utilisés",
   "version": "Version",
-  "vm-is-running": "La VM est en cours d'exécution",
   "vms": "VMs",
   "xo-lite-under-construction": "XOLite est en construction"
 }

@xen-orchestra/lite/src/stores/xen-api.store.ts

@@ -2,7 +2,7 @@ import XapiStats from "@/libs/xapi-stats";
 import XenApi from "@/libs/xen-api/xen-api";
 import { useLocalStorage } from "@vueuse/core";
 import { defineStore } from "pinia";
-import { computed, ref, watchEffect } from "vue";
+import { computed, ref } from "vue";
 
 const HOST_URL = import.meta.env.PROD
   ? window.origin
@@ -17,24 +17,16 @@ enum STATUS {
 export const useXenApiStore = defineStore("xen-api", () => {
   const xenApi = new XenApi(HOST_URL);
   const xapiStats = new XapiStats(xenApi);
-  const storedSessionId = useLocalStorage<string | undefined>(
+  const currentSessionId = useLocalStorage<string | undefined>(
     "sessionId",
     undefined
   );
-  const currentSessionId = ref(storedSessionId.value);
-  const rememberMe = useLocalStorage("rememberMe", false);
   const status = ref(STATUS.DISCONNECTED);
   const isConnected = computed(() => status.value === STATUS.CONNECTED);
   const isConnecting = computed(() => status.value === STATUS.CONNECTING);
   const getXapi = () => xenApi;
   const getXapiStats = () => xapiStats;
 
-  watchEffect(() => {
-    storedSessionId.value = rememberMe.value
-      ? currentSessionId.value
-      : undefined;
-  });
-
   const connect = async (username: string, password: string) => {
     status.value = STATUS.CONNECTING;
 
@@ -71,7 +63,7 @@ export const useXenApiStore = defineStore("xen-api", () => {
 
   async function disconnect() {
     await xenApi.disconnect();
-    currentSessionId.value = undefined;
+    currentSessionId.value = null;
     status.value = STATUS.DISCONNECTED;
   }
 

@xen-orchestra/lite/src/stores/xen-api/host.store.ts

@@ -4,7 +4,6 @@ import type { XenApiHost } from "@/libs/xen-api/xen-api.types";
 import { useXenApiStore } from "@/stores/xen-api.store";
 import { createUseCollection } from "@/stores/xen-api/create-use-collection";
 import { useHostMetricsStore } from "@/stores/xen-api/host-metrics.store";
-import type { XenApiPatch } from "@/types/xen-api";
 import { defineStore } from "pinia";
 import { computed } from "vue";
 
@@ -43,36 +42,10 @@ export const useHostStore = defineStore("xen-api-host", () => {
     });
   }) as GetStats<XenApiHost>;
 
-  const fetchMissingPatches = async (
-    hostRef: XenApiHost["$ref"]
-  ): Promise<XenApiPatch[]> => {
-    const xenApiStore = useXenApiStore();
-
-    const rawPatchesAsString = await xenApiStore
-      .getXapi()
-      .call<string>("host.call_plugin", [
-        hostRef,
-        "updater.py",
-        "check_update",
-        {},
-      ]);
-
-    const rawPatches = JSON.parse(rawPatchesAsString) as Omit<
-      XenApiPatch,
-      "$id"
-    >[];
-
-    return rawPatches.map((rawPatch) => ({
-      ...rawPatch,
-      $id: `${rawPatch.name}-${rawPatch.version}`,
-    }));
-  };
-
   return {
     ...context,
     runningHosts,
     getStats,
-    fetchMissingPatches,
   };
 });
 

@xen-orchestra/lite/src/stories/linear-chart.story.md

@@ -16,6 +16,8 @@ type LinearChartData = {
 
 ```vue-template
 <LinearChart
+  title="Chart title"
+  subtitle="Chart subtitle"
   :data="data"
 />
 ```

@xen-orchestra/lite/src/stories/linear-chart.story.vue

@@ -1,6 +1,8 @@
 <template>
   <ComponentStory
     :params="[
+      prop('title').preset('Chart title').widget(),
+      prop('subtitle').preset('Here is a subtitle').widget(),
       prop('data')
         .preset(data)
         .required()
@@ -56,6 +58,8 @@ const data: LinearChartData = [
 const presets = {
   "Network bandwidth": {
     props: {
+      title: "Network bandwidth",
+      subtitle: "Last week",
       "value-formatter": byteFormatter,
       "max-value": 500000000,
       data: [

@xen-orchestra/lite/src/types/enums.ts

@@ -1,5 +0,0 @@
-export enum UiCardTitleLevel {
-  Title,
-  Subtitle,
-  SubtitleWithUnderline,
-}

@xen-orchestra/lite/src/types/xen-api.ts

@@ -21,19 +21,3 @@ export interface XenApiAlarm<RelationType extends RawObjectType>
   triggerLevel: number;
   type: XenApiAlarmType;
 }
-
-export type XenApiPatch = {
-  $id: string;
-  name: string;
-  description: string;
-  license: string;
-  release: string;
-  size: number;
-  url: string;
-  version: string;
-  changelog: {
-    date: number;
-    description: string;
-    author: string;
-  };
-};

@xen-orchestra/lite/src/views/pool/PoolDashboardView.vue

@@ -3,7 +3,7 @@
     <UiCardGroup>
       <PoolDashboardStatus />
       <PoolDashboardAlarms class="alarms" />
-      <PoolDashboardHostsPatches />
+      <UiCardComingSoon title="Patches" />
     </UiCardGroup>
     <UiCardGroup>
       <UiCardGroup>
@@ -36,12 +36,12 @@ import PoolDashboardTasks from "@/components/pool/dashboard/PoolDashboardTasks.v
 import PoolCpuUsageChart from "@/components/pool/dashboard/cpuUsage/PoolCpuUsageChart.vue";
 import PoolDashboardCpuProvisioning from "@/components/pool/dashboard/PoolDashboardCpuProvisioning.vue";
 import PoolDashboardCpuUsage from "@/components/pool/dashboard/PoolDashboardCpuUsage.vue";
-import PoolDashboardHostsPatches from "@/components/pool/dashboard/PoolDashboardHostsPatches.vue";
 import PoolDashboardNetworkChart from "@/components/pool/dashboard/PoolDashboardNetworkChart.vue";
 import PoolDashboardRamUsage from "@/components/pool/dashboard/PoolDashboardRamUsage.vue";
 import PoolDashboardStatus from "@/components/pool/dashboard/PoolDashboardStatus.vue";
 import PoolDashboardStorageUsage from "@/components/pool/dashboard/PoolDashboardStorageUsage.vue";
 import PoolDashboardRamUsageChart from "@/components/pool/dashboard/ramUsage/PoolRamUsage.vue";
+import UiCardComingSoon from "@/components/ui/UiCardComingSoon.vue";
 import UiCardGroup from "@/components/ui/UiCardGroup.vue";
 import { useHostCollection } from "@/stores/xen-api/host.store";
 import { useVmCollection } from "@/stores/xen-api/vm.store";

@xen-orchestra/mixins/Tasks.mjs

@@ -24,8 +24,6 @@ const serializeError = error => ({
 })
 
 export default class Tasks extends EventEmitter {
-  #logsToClearOnSuccess = new Set()
-
   // contains consolidated logs of all live and finished tasks
   #store
 
@@ -38,22 +36,6 @@ export default class Tasks extends EventEmitter {
       this.#tasks.delete(id)
     },
     onTaskUpdate: async taskLog => {
-      const { id, status } = taskLog
-      if (status !== 'pending') {
-        if (this.#logsToClearOnSuccess.has(id)) {
-          this.#logsToClearOnSuccess.delete(id)
-
-          if (status === 'success') {
-            try {
-              await this.#store.del(id)
-            } catch (error) {
-              warn('failure on deleting task log from store', { error, taskLog })
-            }
-            return
-          }
-        }
-      }
-
       // Error objects are not JSON-ifiable by default
       const { result } = taskLog
       if (result instanceof Error && result.toJSON === undefined) {
@@ -153,13 +135,10 @@ export default class Tasks extends EventEmitter {
    *
    * @returns {Task}
    */
-  create(
-    { name, objectId, userId = this.#app.apiContext?.user?.id, type, ...props },
-    { clearLogOnSuccess = false } = {}
-  ) {
+  create({ name, objectId, userId = this.#app.apiContext?.user?.id, type }) {
     const tasks = this.#tasks
 
-    const task = new Task({ properties: { ...props, name, objectId, userId, type }, onProgress: this.#onProgress })
+    const task = new Task({ properties: { name, objectId, userId, type }, onProgress: this.#onProgress })
 
     // Use a compact, sortable, string representation of the creation date
     //
@@ -173,9 +152,6 @@ export default class Tasks extends EventEmitter {
     task.id = id
 
     tasks.set(id, task)
-    if (clearLogOnSuccess) {
-      this.#logsToClearOnSuccess.add(id)
-    }
 
     return task
   }

@xen-orchestra/mixins/package.json

@@ -14,7 +14,7 @@
     "url": "https://vates.fr"
   },
   "license": "AGPL-3.0-or-later",
-  "version": "0.13.0",
+  "version": "0.12.0",
   "engines": {
     "node": ">=15.6"
   },

@xen-orchestra/proxy/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@xen-orchestra/proxy",
-  "version": "0.26.35",
+  "version": "0.26.33",
   "license": "AGPL-3.0-or-later",
   "description": "XO Proxy used to remotely execute backup jobs",
   "keywords": [
@@ -32,13 +32,13 @@
     "@vates/decorate-with": "^2.0.0",
     "@vates/disposable": "^0.1.4",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.43.0",
+    "@xen-orchestra/backups": "^0.42.0",
     "@xen-orchestra/fs": "^4.1.0",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/mixin": "^0.1.0",
-    "@xen-orchestra/mixins": "^0.13.0",
+    "@xen-orchestra/mixins": "^0.12.0",
     "@xen-orchestra/self-signed": "^0.1.3",
-    "@xen-orchestra/xapi": "^3.2.0",
+    "@xen-orchestra/xapi": "^3.1.0",
     "ajv": "^8.0.3",
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.1.0",

@xen-orchestra/upload-ova/package.json

@@ -43,7 +43,7 @@
     "pw": "^0.0.4",
     "xdg-basedir": "^4.0.0",
     "xo-lib": "^0.11.1",
-    "xo-vmdk-to-vhd": "^2.5.6"
+    "xo-vmdk-to-vhd": "^2.5.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",

@xen-orchestra/vmware-explorer/package.json

@@ -10,7 +10,7 @@
     "@xen-orchestra/log": "^0.6.0",
     "lodash": "^4.17.21",
     "node-fetch": "^3.3.0",
-    "vhd-lib": "^4.6.1"
+    "vhd-lib": "^4.5.0"
   },
   "engines": {
     "node": ">=14"

@xen-orchestra/xapi/_Mixins.mjs

@@ -5,4 +5,3 @@ export { default as VBD } from './vbd.mjs'
 export { default as VDI } from './vdi.mjs'
 export { default as VIF } from './vif.mjs'
 export { default as VM } from './vm.mjs'
-export { default as VTPM } from './vtpm.mjs'

@xen-orchestra/xapi/host.mjs

@@ -1,8 +1,6 @@
 import { asyncEach } from '@vates/async-each'
-import { asyncMap } from '@xen-orchestra/async-map'
 import { decorateClass } from '@vates/decorate-with'
 import { defer } from 'golike-defer'
-import { incorrectState, operationFailed } from 'xo-common/api-errors.js'
 
 import { getCurrentVmUuid } from './_XenStore.mjs'
 
@@ -33,38 +31,7 @@ class Host {
    *
    * @param {string} ref - Opaque reference of the host
    */
-  async smartReboot($defer, ref, bypassBlockedSuspend = false, bypassCurrentVmCheck = false) {
-    let currentVmRef
-    try {
-      currentVmRef = await this.call('VM.get_by_uuid', await getCurrentVmUuid())
-    } catch (error) {}
-
-    const residentVmRefs = await this.getField('host', ref, 'resident_VMs')
-    const vmsWithSuspendBlocked = await asyncMap(residentVmRefs, ref => this.getRecord('VM', ref)).filter(
-      vm =>
-        vm.$ref !== currentVmRef &&
-        !vm.is_control_domain &&
-        vm.power_state !== 'Halted' &&
-        vm.power_state !== 'Suspended' &&
-        vm.blocked_operations.suspend !== undefined
-    )
-
-    if (!bypassBlockedSuspend && vmsWithSuspendBlocked.length > 0) {
-      throw incorrectState({ actual: vmsWithSuspendBlocked.map(vm => vm.uuid), expected: [], object: 'suspendBlocked' })
-    }
-
-    if (!bypassCurrentVmCheck && residentVmRefs.includes(currentVmRef)) {
-      throw operationFailed({
-        objectId: await this.getField('VM', currentVmRef, 'uuid'),
-        code: 'xoaOnHost',
-      })
-    }
-
-    await asyncEach(vmsWithSuspendBlocked, vm => {
-      $defer(() => vm.update_blocked_operations('suspend', vm.blocked_operations.suspend ?? null))
-      return vm.update_blocked_operations('suspend', null)
-    })
-
+  async smartReboot($defer, ref) {
     const suspendedVms = []
     if (await this.getField('host', ref, 'enabled')) {
       await this.callAsync('host.disable', ref)
@@ -75,8 +42,13 @@ class Host {
       })
     }
 
+    let currentVmRef
+    try {
+      currentVmRef = await this.call('VM.get_by_uuid', await getCurrentVmUuid())
+    } catch (error) {}
+
     await asyncEach(
-      residentVmRefs,
+      await this.getField('host', ref, 'resident_VMs'),
       async vmRef => {
         if (vmRef === currentVmRef) {
           return

@xen-orchestra/xapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/xapi",
-  "version": "3.2.0",
+  "version": "3.1.0",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/xapi",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
   "repository": {
@@ -34,7 +34,7 @@
     "json-rpc-protocol": "^0.13.2",
     "lodash": "^4.17.15",
     "promise-toolbox": "^0.21.0",
-    "vhd-lib": "^4.6.1",
+    "vhd-lib": "^4.5.0",
     "xo-common": "^0.8.0"
   },
   "private": false,

@xen-orchestra/xapi/vdi.mjs

@@ -134,23 +134,22 @@ class Vdi {
     if (stream.length === undefined) {
       throw new Error('Trying to import a VDI without a length field. Please report this error to Xen Orchestra.')
     }
-
-    const vdi = await this.getRecord('VDI', ref)
-    const sr = await this.getRecord('SR', vdi.SR)
-
     try {
       await this.putResource(cancelToken, stream, '/import_raw_vdi/', {
         query: {
           format,
           vdi: ref,
         },
-        task: await this.task_create(`Importing content into VDI ${vdi.name_label} on SR ${sr.name_label}`),
+        task: await this.task_create(`Importing content into VDI ${await this.getField('VDI', ref, 'name_label')}`),
       })
     } catch (error) {
       // augment the error with as much relevant info as possible
-      const poolMaster = await this.getRecord('host', this.pool.master)
+      const [poolMaster, vdi] = await Promise.all([
+        this.getRecord('host', this.pool.master),
+        this.getRecord('VDI', ref),
+      ])
       error.pool_master = poolMaster
-      error.SR = sr
+      error.SR = await this.getRecord('SR', vdi.SR)
       error.VDI = vdi
       throw error
     }

@xen-orchestra/xapi/vtpm.mjs

@@ -1,37 +0,0 @@
-import upperFirst from 'lodash/upperFirst.js'
-import { incorrectState } from 'xo-common/api-errors.js'
-
-export default class Vtpm {
-  async create({ is_unique = false, VM }) {
-    const pool = this.pool
-
-    // If VTPM.create is called on a pool that doesn't support VTPM, the errors aren't explicit.
-    // See https://github.com/xapi-project/xen-api/issues/5186
-    if (pool.restrictions.restrict_vtpm !== 'false') {
-      throw incorrectState({
-        actual: pool.restrictions.restrict_vtpm,
-        expected: 'false',
-        object: pool.uuid,
-        property: 'restrictions.restrict_vtpm',
-      })
-    }
-
-    try {
-      return await this.call('VTPM.create', VM, is_unique)
-    } catch (error) {
-      const { code, params } = error
-      if (code === 'VM_BAD_POWER_STATE') {
-        const [, expected, actual] = params
-        // In `VM_BAD_POWER_STATE` errors, the power state is lowercased
-        throw incorrectState({
-          actual: upperFirst(actual),
-          expected: upperFirst(expected),
-          object: await this.getField('VM', VM, 'uuid'),
-          property: 'power_state',
-        })
-      }
-
-      throw error
-    }
-  }
-}

CHANGELOG.md

@@ -1,59 +1,8 @@
 # ChangeLog
 
-## **5.87.0** (2023-09-29)
-
-<img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
-
-### Highlights
-
-- [Patches] Support new XenServer Updates system. See [our documentation](https://xen-orchestra.com/docs/updater.html#xenserver-updates). (PR [#7044](https://github.com/vatesfr/xen-orchestra/pull/7044))
-- [Host/Advanced] New button to download system logs [#3968](https://github.com/vatesfr/xen-orchestra/issues/3968) (PR [#7048](https://github.com/vatesfr/xen-orchestra/pull/7048))
-- [Home/Hosts, Pools] Display host brand and version (PR [#7027](https://github.com/vatesfr/xen-orchestra/pull/7027))
-- [SR] Ability to reclaim space [#1204](https://github.com/vatesfr/xen-orchestra/issues/1204) (PR [#7054](https://github.com/vatesfr/xen-orchestra/pull/7054))
-- [XOA] New button to restart XO Server directly from the UI (PR [#7056](https://github.com/vatesfr/xen-orchestra/pull/7056))
-- [Host/Advanced] Display system disks health based on the _smartctl_ plugin. [#4458](https://github.com/vatesfr/xen-orchestra/issues/4458) (PR [#7060](https://github.com/vatesfr/xen-orchestra/pull/7060))
-- [Authentication] Failed attempts are now logged as XO tasks (PR [#7061](https://github.com/vatesfr/xen-orchestra/pull/7061))
-- [Backup] Prevent VMs from being migrated while they are backed up (PR [#7024](https://github.com/vatesfr/xen-orchestra/pull/7024))
-- [Backup] Prevent VMs from being backed up while they are migrated (PR [#7024](https://github.com/vatesfr/xen-orchestra/pull/7024))
-
-### Enhancements
-
-- [Netbox] Don't delete VMs that have been created manually in XO-synced cluster [Forum#7639](https://xcp-ng.org/forum/topic/7639) (PR [#7008](https://github.com/vatesfr/xen-orchestra/pull/7008))
-- [Kubernetes] _Search domains_ field is now optional [#7028](https://github.com/vatesfr/xen-orchestra/pull/7028)
-- [REST API] Hosts' audit and system logs can be downloaded [#3968](https://github.com/vatesfr/xen-orchestra/issues/3968) (PR [#7048](https://github.com/vatesfr/xen-orchestra/pull/7048))
-
-### Bug fixes
-
-- [Backup/Restore] Fix `Cannot read properties of undefined (reading 'id')` error when restoring via an XO Proxy (PR [#7026](https://github.com/vatesfr/xen-orchestra/pull/7026))
-- [Google/GitHub Auth] Fix `Internal Server Error` (xo-server: `Cannot read properties of undefined (reading 'id')`) when logging in with Google or GitHub [Forum#7729](https://xcp-ng.org/forum/topic/7729) (PRs [#7031](https://github.com/vatesfr/xen-orchestra/pull/7031) [#7032](https://github.com/vatesfr/xen-orchestra/pull/7032))
-- [Jobs] Fix schedules not being displayed on first load [#6968](https://github.com/vatesfr/xen-orchestra/issues/6968) (PR [#7034](https://github.com/vatesfr/xen-orchestra/pull/7034))
-- [OVA Export] Fix support of disks with more than 8.2GiB of content (PR [#7047](https://github.com/vatesfr/xen-orchestra/pull/7047))
-- [Backup] Fix `VHDFile implementation is not compatible with encrypted remote` when using VHD directory with encryption (PR [#7045](https://github.com/vatesfr/xen-orchestra/pull/7045))
-- [Backup/Mirror] Fix `xo:fs:local WARN lock compromised` when mirroring a Backup Repository to a local/NFS/SMB repository ([#7043](https://github.com/vatesfr/xen-orchestra/pull/7043))
-- [Ova import] Fix importing VM with collision in disk position (PR [#7051](https://github.com/vatesfr/xen-orchestra/pull/7051)) (issue [7046](https://github.com/vatesfr/xen-orchestra/issues/7046))
-- [Backup/Mirror] Fix backup report not being sent (PR [#7049](https://github.com/vatesfr/xen-orchestra/pull/7049))
-- [New VM] Only add MBR to cloud-init drive on Windows VMs to avoid booting issues (e.g. with Talos) (PR [#7050](https://github.com/vatesfr/xen-orchestra/pull/7050))
-- [VDI Import] Add the SR name to the corresponding XAPI task (PR [#6979](https://github.com/vatesfr/xen-orchestra/pull/6979))
-
-### Released packages
-
-- xo-vmdk-to-vhd 2.5.6
-- xo-server-auth-github 0.3.1
-- xo-server-auth-google 0.3.1
-- xo-server-netbox 1.3.0
-- vhd-lib 4.6.1
-- @xen-orchestra/xapi 3.2.0
-- @xen-orchestra/backups 0.43.0
-- @xen-orchestra/backups-cli 1.0.13
-- @xen-orchestra/mixins 0.13.0
-- @xen-orchestra/proxy 0.26.35
-- xo-server 5.124.0
-- xo-server-backup-reports 0.17.4
-- xo-web 5.126.0
-
 ## **5.86.1** (2023-09-07)
 
-<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
+<img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
 
 ### Bug fixes
 
@@ -116,6 +65,8 @@
 
 ## **5.85.0** (2023-07-31)
 
+<img id="stable" src="https://badgen.net/badge/channel/stable/green" alt="Channel: stable" />
+
 ### Highlights
 
 - [Import/From VMWare] Support ESXi 6.5+ with snapshot (PR [#6909](https://github.com/vatesfr/xen-orchestra/pull/6909))

CHANGELOG.unreleased.md

@@ -7,22 +7,26 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
-- [Host/Advanced] Allow to force _Smart reboot_ if some resident VMs have the suspend operation blocked [Forum#7136](https://xcp-ng.org/forum/topic/7136/suspending-vms-during-host-reboot/23) (PR [#7025](https://github.com/vatesfr/xen-orchestra/pull/7025))
-- [Plugin/backup-report] Errors are now listed in XO tasks
-- [PIF] Show network name in PIF selectors (PR [#7081](https://github.com/vatesfr/xen-orchestra/pull/7081))
+- [Netbox] Don't delete VMs that have been created manually in XO-synced cluster [Forum#7639](https://xcp-ng.org/forum/topic/7639) (PR [#7008](https://github.com/vatesfr/xen-orchestra/pull/7008))
+- [Kubernetes] _Search domains_ field is now optional [#7028](https://github.com/vatesfr/xen-orchestra/pull/7028)
+- [Patches] Support new XenServer Updates system. See [our documentation](https://xen-orchestra.com/docs/updater.html#xenserver-updates). (PR [#7044](https://github.com/vatesfr/xen-orchestra/pull/7044))
+- [REST API] Hosts' audit and system logs can be downloaded [#3968](https://github.com/vatesfr/xen-orchestra/issues/3968) (PR [#7048](https://github.com/vatesfr/xen-orchestra/pull/7048))
+- [Host/Advanced] New button to download system logs [#3968](https://github.com/vatesfr/xen-orchestra/issues/3968) (PR [#7048](https://github.com/vatesfr/xen-orchestra/pull/7048))
+- [Home/Hosts, Pools] Display host brand and version (PR [#7027](https://github.com/vatesfr/xen-orchestra/pull/7027))
+- [SR] Ability to reclaim space [#1204](https://github.com/vatesfr/xen-orchestra/issues/1204) (PR [#7054](https://github.com/vatesfr/xen-orchestra/pull/7054))
+- [XOA] New button to restart XO Server directly from the UI (PR [#7056](https://github.com/vatesfr/xen-orchestra/pull/7056))
 
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
-- [Rolling Pool Update] After the update, when migrating VMs back to their host, do not migrate VMs that are already on the right host [Forum#7802](https://xcp-ng.org/forum/topic/7802) (PR [#7071](https://github.com/vatesfr/xen-orchestra/pull/7071))
-- [RPU] Fix "XenServer credentials not found" when running a Rolling Pool Update on a XenServer pool (PR [#7089](https://github.com/vatesfr/xen-orchestra/pull/7089))
-- [Usage report] Fix "Converting circular structure to JSON" error
-- [Home] Fix OS icons alignment (PR [#7090](https://github.com/vatesfr/xen-orchestra/pull/7090))
-- [SR/Advanced] Fix the total number of VDIs to coalesce by taking into account common chains [#7016](https://github.com/vatesfr/xen-orchestra/issues/7016) (PR [#7098](https://github.com/vatesfr/xen-orchestra/pull/7098))
-- Don't require to sign in again in XO after losing connection to XO Server (e.g. when restarting or upgrading XO) (PR [#7103](https://github.com/vatesfr/xen-orchestra/pull/7103))
-- [Usage report] Fix "Converting circular structure to JSON" error (PR [#7096](https://github.com/vatesfr/xen-orchestra/pull/7096))
-- [Usage report] Fix "Cannot convert undefined or null to object" error (PR [#7092](https://github.com/vatesfr/xen-orchestra/pull/7092))
+- [Backup/Restore] Fix `Cannot read properties of undefined (reading 'id')` error when restoring via an XO Proxy (PR [#7026](https://github.com/vatesfr/xen-orchestra/pull/7026))
+- [Google/GitHub Auth] Fix `Internal Server Error` (xo-server: `Cannot read properties of undefined (reading 'id')`) when logging in with Google or GitHub [Forum#7729](https://xcp-ng.org/forum/topic/7729) (PRs [#7031](https://github.com/vatesfr/xen-orchestra/pull/7031) [#7032](https://github.com/vatesfr/xen-orchestra/pull/7032))
+- [Jobs] Fix schedules not being displayed on first load [#6968](https://github.com/vatesfr/xen-orchestra/issues/6968) (PR [#7034](https://github.com/vatesfr/xen-orchestra/pull/7034))
+- [OVA Export] Fix support of disks with more than 8.2GiB of content (PR [#7047](https://github.com/vatesfr/xen-orchestra/pull/7047))
+- [Backup] Fix `VHDFile implementation is not compatible with encrypted remote` when using VHD directory with encryption (PR [#7045](https://github.com/vatesfr/xen-orchestra/pull/7045))
+- [Backup/Mirror] Fix `xo:fs:local WARN lock compromised` when mirroring a Backup Repository to a local/NFS/SMB repository ([#7043](https://github.com/vatesfr/xen-orchestra/pull/7043))
+- [Ova import] Fix importing VM with collision in disk position (PR [#7051](https://github.com/vatesfr/xen-orchestra/pull/7051)) (issue [7046](https://github.com/vatesfr/xen-orchestra/issues/7046))
 
 ### Packages to release
 
@@ -40,12 +44,13 @@
 
 <!--packages-start-->
 
-- @xen-orchestra/mixins minor
-- @xen-orchestra/xapi minor
+- @xen-orchestra/backups patch
+- vhd-lib minor
+- xo-vmdk-to-vhd patch
 - xo-server minor
-- xo-server-backup-reports minor
-- xo-server-netbox patch
-- xo-server-usage-report patch
+- xo-server-auth-github patch
+- xo-server-auth-google patch
+- xo-server-netbox minor
 - xo-web minor
 
 <!--packages-end-->

docs/advanced.md

@@ -362,7 +362,7 @@ XO will try to find the right prefix for each IP address. If it can't find a pre
   - Assign it to object types:
     - Virtualization > cluster
     - Virtualization > virtual machine
-    - Virtualization > interface
+    - Virtualization > interface`
 
 ![](./assets/customfield.png)
 

docs/configuration.md

@@ -94,9 +94,9 @@ uri = 'tcp://db:password@hostname:port'
 
 ## Proxy for updates and patches
 
-To check if your hosts are up-to-date, we need to access `https://updates.ops.xenserver.com/xenserver/updates.xml`.
+To check if your hosts are up-to-date, we need to access `http://updates.xensource.com/XenServer/updates.xml`.
 
-And to download the patches, we need access to `https://fileservice.citrix.com/direct/v2/download/secured/support/article/*/downloads/*.zip`.
+And to download the patches, we need access to `http://support.citrix.com/supportkc/filedownload?`.
 
 To do that behind a corporate proxy, just add the `httpProxy` variable to match your current proxy configuration.
 

docs/installation.md

@@ -82,13 +82,13 @@ As you may have seen in other parts of the documentation, XO is composed of two
 
 #### NodeJS
 
-XO requires Node.js 18.
+XO needs Node.js. **Please always use latest Node LTS**.
 
 We'll consider at this point that you've got a working node on your box. E.g:
 
 ```console
 $ node -v
-v18.18.0
+v16.14.0
 ```
 
 If not, see [this page](https://nodejs.org/en/download/package-manager/) for instructions on how to install Node.
@@ -106,7 +106,7 @@ XO needs the following packages to be installed. Redis is used as a database by
 For example, on Debian/Ubuntu:
 
 ```sh
-apt-get install build-essential redis-server libpng-dev git python3-minimal libvhdi-utils lvm2 cifs-utils nfs-common
+apt-get install build-essential redis-server libpng-dev git python3-minimal libvhdi-utils lvm2 cifs-utils
 ```
 
 On Fedora/CentOS like:

packages/vhd-cli/commands/info.js

@@ -37,7 +37,7 @@ function mapProperties(object, mapping) {
 }
 
 async function showDetails(handler, path) {
-  const {value: vhd} = await openVhd(handler, resolve(path))
+  const vhd = new VhdFile(handler, resolve(path))
 
   try {
     await vhd.readHeaderAndFooter()

packages/vhd-cli/package.json

@@ -31,7 +31,7 @@
     "lodash": "^4.17.21",
     "promise-toolbox": "^0.21.0",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.6.1"
+    "vhd-lib": "^4.5.0"
   },
   "scripts": {
     "postversion": "npm publish",

packages/vhd-lib/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vhd-lib",
-  "version": "4.6.1",
+  "version": "4.5.0",
   "license": "AGPL-3.0-or-later",
   "description": "Primitives for VHD file handling",
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/packages/vhd-lib",

packages/vhd-lib/tests/utils.js

@@ -25,16 +25,8 @@ async function checkFile(vhdName) {
   // Since the qemu-img check command isn't compatible with vhd format, we use
   // the convert command to do a check by conversion. Indeed, the conversion will
   // fail if the source file isn't a proper vhd format.
-  const target = vhdName + '.qcow2'
-  try {
-    await execa('qemu-img', ['convert', '-fvpc', '-Oqcow2', vhdName, target])
-  } finally {
-    try {
-      await fsPromise.unlink(target)
-    } catch (err) {
-      console.warn(err)
-    }
-  }
+  await execa('qemu-img', ['convert', '-fvpc', '-Oqcow2', vhdName, 'outputFile.qcow2'])
+  await fsPromise.unlink('./outputFile.qcow2')
 }
 exports.checkFile = checkFile
 

packages/xen-api/examples/package.json

@@ -8,6 +8,6 @@
     "promise-toolbox": "^0.19.2",
     "readable-stream": "^3.1.1",
     "throttle": "^1.0.3",
-    "vhd-lib": "^4.6.1"
+    "vhd-lib": "^4.5.0"
   }
 }

packages/xen-api/src/cli.js

@@ -130,6 +130,6 @@ async function main(createClient) {
 }
 export default main
 
-if (module.parent === null) {
+if (!module.parent) {
   main(require('./').createClient).catch(console.error.bind(console, 'FATAL'))
 }

packages/xo-server-auth-github/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-github",
-  "version": "0.3.1",
+  "version": "0.3.0",
   "license": "AGPL-3.0-or-later",
   "description": "GitHub authentication plugin for XO-Server",
   "keywords": [

packages/xo-server-auth-google/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-auth-google",
-  "version": "0.3.1",
+  "version": "0.3.0",
   "license": "AGPL-3.0-or-later",
   "description": "Google authentication plugin for XO-Server",
   "keywords": [

packages/xo-server-backup-reports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-backup-reports",
-  "version": "0.17.4",
+  "version": "0.17.3",
   "license": "AGPL-3.0-or-later",
   "description": "Backup reports plugin for XO-Server",
   "keywords": [

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

@@ -90,8 +90,6 @@ const formatSpeed = (bytes, milliseconds) =>
       })
     : 'N/A'
 
-const noop = Function.prototype
-
 const NO_VMS_MATCH_THIS_PATTERN = 'no VMs match this pattern'
 const NO_SUCH_OBJECT_ERROR = 'no such object'
 const UNHEALTHY_VDI_CHAIN_ERROR = 'unhealthy VDI chain'
@@ -195,17 +193,13 @@ const toMarkdown = parts => {
 class BackupReportsXoPlugin {
   constructor(xo) {
     this._xo = xo
-
-    const report = this._report
-    this._report = (...args) =>
-      xo.tasks
-        .create(
-          { type: 'xo:xo-server-backup-reports:sendReport', name: 'Sending backup report', runId: args[0] },
-          { clearLogOnSuccess: true }
-        )
-        .run(() => report.call(this, ...args))
-
-    this._eventListener = (...args) => this._report(...args).catch(noop)
+    this._eventListener = async (...args) => {
+      try {
+        await this._report(...args)
+      } catch (error) {
+        logger.warn(error)
+      }
+    }
   }
 
   configure({ toMails, toXmpp }) {
@@ -255,7 +249,7 @@ class BackupReportsXoPlugin {
       }),
     ])
 
-    if (job.type === 'backup' || job.type === 'mirrorBackup') {
+    if (job.type === 'backup') {
       return this._ngVmHandler(log, job, schedule, force)
     } else if (job.type === 'metadataBackup') {
       return this._metadataHandler(log, job, schedule, force)
@@ -601,28 +595,24 @@ class BackupReportsXoPlugin {
     })
   }
 
-  async _sendReport({ mailReceivers, markdown, subject, success }) {
+  _sendReport({ mailReceivers, markdown, subject, success }) {
     if (mailReceivers === undefined || mailReceivers.length === 0) {
       mailReceivers = this._mailsReceivers
     }
 
     const xo = this._xo
-    const promises = [
-      mailReceivers !== undefined &&
-        (xo.sendEmail === undefined
-          ? Promise.reject(new Error('transport-email plugin not enabled'))
-          : xo.sendEmail({
-              to: mailReceivers,
-              subject,
-              markdown,
-            })),
-      this._xmppReceivers !== undefined &&
-        (xo.sendEmail === undefined
-          ? Promise.reject(new Error('transport-xmpp plugin not enabled'))
-          : xo.sendToXmppClient({
-              to: this._xmppReceivers,
-              message: markdown,
-            })),
+    return Promise.all([
+      xo.sendEmail !== undefined &&
+        xo.sendEmail({
+          to: mailReceivers,
+          subject,
+          markdown,
+        }),
+      xo.sendToXmppClient !== undefined &&
+        xo.sendToXmppClient({
+          to: this._xmppReceivers,
+          message: markdown,
+        }),
       xo.sendSlackMessage !== undefined &&
         xo.sendSlackMessage({
           message: markdown,
@@ -632,22 +622,7 @@ class BackupReportsXoPlugin {
           status: success ? 'OK' : 'CRITICAL',
           message: markdown,
         }),
-    ]
-
-    const errors = []
-    const pushError = errors.push.bind(errors)
-
-    await Promise.all(promises.filter(Boolean).map(_ => _.catch(pushError)))
-
-    if (errors.length !== 0) {
-      throw new AggregateError(
-        errors,
-        errors
-          .map(_ => _.message)
-          .filter(_ => _ != null && _.length !== 0)
-          .join(', ')
-      )
-    }
+    ])
   }
 
   _legacyVmHandler(status) {

packages/xo-server-netbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-netbox",
-  "version": "1.3.0",
+  "version": "1.2.0",
   "license": "AGPL-3.0-or-later",
   "description": "Synchronizes pools managed by Xen Orchestra with Netbox",
   "keywords": [

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

@@ -103,8 +103,6 @@ class Netbox {
   }
 
   async test() {
-    await this.#checkCustomFields()
-
     const randomSuffix = Math.random().toString(36).slice(2, 11)
     const name = '[TMP] Xen Orchestra Netbox plugin test - ' + randomSuffix
     await this.#request('/virtualization/cluster-types/', 'POST', {
@@ -115,6 +113,8 @@ class Netbox {
     })
     const nbClusterTypes = await this.#request(`/virtualization/cluster-types/?name=${encodeURIComponent(name)}`)
 
+    await this.#checkCustomFields()
+
     if (nbClusterTypes.length !== 1) {
       throw new Error('Could not properly write and read Netbox')
     }
@@ -336,8 +336,20 @@ class Netbox {
         tags: [],
       }
 
-      const distro = xoVm.os_version?.distro
-      if (distro != null) {
+      let distro = xoVm.os_version?.distro
+      if (distro !== undefined) {
+        // In some cases, the version isn't properly parsed by XAPI and
+        // os_version.major returns X.Y.Z instead of X
+        const majorVersionMatch = xoVm.os_version.major?.match(/^(\d+)(?:\.\d+){0,2}$/)
+        if (majorVersionMatch != null) {
+          distro += ` ${majorVersionMatch[1]}`
+        } else {
+          const unameMatch = xoVm.os_version.uname?.match(/^(\d)+/)
+          if (unameMatch != null) {
+            distro += ` ${unameMatch[1]}`
+          }
+        }
+
         const slug = slugify(distro)
         let nbPlatform = find(nbPlatforms, { slug })
         if (nbPlatform === undefined) {

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

@@ -12,9 +12,9 @@ import {
   filter,
   find,
   forEach,
+  get,
   isFinite,
   map,
-  mapValues,
   orderBy,
   round,
   values,
@@ -204,11 +204,6 @@ function computeMean(values) {
     }
   })
 
-  // No values to work with, return null
-  if (n === 0) {
-    return null
-  }
-
   return sum / n
 }
 
@@ -231,7 +226,7 @@ function getTop(objects, options) {
           object => {
             const value = object[opt]
 
-            return isNaN(value) || value === null ? -Infinity : value
+            return isNaN(value) ? -Infinity : value
           },
           'desc'
         ).slice(0, 3),
@@ -249,9 +244,7 @@ function computePercentage(curr, prev, options) {
   return zipObject(
     options,
     map(options, opt =>
-      prev[opt] === 0 || prev[opt] === null || curr[opt] === null
-        ? 'NONE'
-        : `${((curr[opt] - prev[opt]) * 100) / prev[opt]}`
+      prev[opt] === 0 || prev[opt] === null ? 'NONE' : `${((curr[opt] - prev[opt]) * 100) / prev[opt]}`
     )
   )
 }
@@ -264,15 +257,7 @@ function getDiff(oldElements, newElements) {
 }
 
 function getMemoryUsedMetric({ memory, memoryFree = memory }) {
-  return map(memory, (value, key) => {
-    const tMemory = value
-    const tMemoryFree = memoryFree[key]
-    if (tMemory == null || tMemoryFree == null) {
-      return null
-    }
-
-    return tMemory - tMemoryFree
-  })
+  return map(memory, (value, key) => value - memoryFree[key])
 }
 
 const METRICS_MEAN = {
@@ -289,61 +274,51 @@ const DAYS_TO_KEEP = {
   weekly: 7,
   monthly: 30,
 }
-
-function getDeepLastValues(data, nValues) {
-  if (data == null) {
-    return {}
+function getLastDays(data, periodicity) {
+  const daysToKeep = DAYS_TO_KEEP[periodicity]
+  const expectedData = {}
+  for (const [key, value] of Object.entries(data)) {
+    if (Array.isArray(value)) {
+      // slice only applies to array
+      expectedData[key] = value.slice(-daysToKeep)
+    } else {
+      expectedData[key] = value
+    }
   }
-
-  if (Array.isArray(data)) {
-    return data.slice(-nValues)
-  }
-
-  if (typeof data !== 'object') {
-    throw new Error('data must be an object or an array')
-  }
-
-  return mapValues(data, value => getDeepLastValues(value, nValues))
+  return expectedData
 }
 
 // ===================================================================
 
 async function getVmsStats({ runningVms, periodicity, xo }) {
-  const lastNValues = DAYS_TO_KEEP[periodicity]
-
   return orderBy(
     await Promise.all(
       map(runningVms, async vm => {
-        const stats = getDeepLastValues(
-          (
-            await xo.getXapiVmStats(vm, GRANULARITY).catch(error => {
-              log.warn('Error on fetching VM stats', {
-                error,
-                vmId: vm.id,
-              })
-              return {
-                stats: {},
-              }
-            })
-          ).stats,
-          lastNValues
-        )
+        const { stats } = await xo.getXapiVmStats(vm, GRANULARITY).catch(error => {
+          log.warn('Error on fetching VM stats', {
+            error,
+            vmId: vm.id,
+          })
+          return {
+            stats: {},
+          }
+        })
 
-        const iopsRead = METRICS_MEAN.iops(stats.iops?.r)
-        const iopsWrite = METRICS_MEAN.iops(stats.iops?.w)
+        const iopsRead = METRICS_MEAN.iops(getLastDays(get(stats.iops, 'r'), periodicity))
+        const iopsWrite = METRICS_MEAN.iops(getLastDays(get(stats.iops, 'w'), periodicity))
         return {
           uuid: vm.uuid,
           name: vm.name_label,
           addresses: Object.values(vm.addresses),
-          cpu: METRICS_MEAN.cpu(stats.cpus),
-          ram: METRICS_MEAN.ram(getMemoryUsedMetric(stats)),
-          diskRead: METRICS_MEAN.disk(stats.xvds?.r),
-          diskWrite: METRICS_MEAN.disk(stats.xvds?.w),
+          cpu: METRICS_MEAN.cpu(getLastDays(stats.cpus, periodicity)),
+          ram: METRICS_MEAN.ram(getLastDays(getMemoryUsedMetric(stats), periodicity)),
+          diskRead: METRICS_MEAN.disk(getLastDays(get(stats.xvds, 'r'), periodicity)),
+          diskWrite: METRICS_MEAN.disk(getLastDays(get(stats.xvds, 'w'), periodicity)),
           iopsRead,
           iopsWrite,
           iopsTotal: iopsRead + iopsWrite,
-          netReception: METRICS_MEAN.net(stats.vifs?.rx),
-          netTransmission: METRICS_MEAN.net(stats.vifs?.tx),
+          netReception: METRICS_MEAN.net(getLastDays(get(stats.vifs, 'rx'), periodicity)),
+          netTransmission: METRICS_MEAN.net(getLastDays(get(stats.vifs, 'tx'), periodicity)),
         }
       })
     ),
@@ -353,34 +328,27 @@ async function getVmsStats({ runningVms, periodicity, xo }) {
 }
 
 async function getHostsStats({ runningHosts, periodicity, xo }) {
-  const lastNValues = DAYS_TO_KEEP[periodicity]
-
   return orderBy(
     await Promise.all(
       map(runningHosts, async host => {
-        const stats = getDeepLastValues(
-          (
-            await xo.getXapiHostStats(host, GRANULARITY).catch(error => {
-              log.warn('Error on fetching host stats', {
-                error,
-                hostId: host.id,
-              })
-              return {
-                stats: {},
-              }
-            })
-          ).stats,
-          lastNValues
-        )
+        const { stats } = await xo.getXapiHostStats(host, GRANULARITY).catch(error => {
+          log.warn('Error on fetching host stats', {
+            error,
+            hostId: host.id,
+          })
+          return {
+            stats: {},
+          }
+        })
 
         return {
           uuid: host.uuid,
           name: host.name_label,
-          cpu: METRICS_MEAN.cpu(stats.cpus),
-          ram: METRICS_MEAN.ram(getMemoryUsedMetric(stats)),
-          load: METRICS_MEAN.load(stats.load),
-          netReception: METRICS_MEAN.net(stats.pifs?.rx),
-          netTransmission: METRICS_MEAN.net(stats.pifs?.tx),
+          cpu: METRICS_MEAN.cpu(getLastDays(stats.cpus, periodicity)),
+          ram: METRICS_MEAN.ram(getLastDays(getMemoryUsedMetric(stats), periodicity)),
+          load: METRICS_MEAN.load(getLastDays(stats.load, periodicity)),
+          netReception: METRICS_MEAN.net(getLastDays(get(stats.pifs, 'rx'), periodicity)),
+          netTransmission: METRICS_MEAN.net(getLastDays(get(stats.pifs, 'tx'), periodicity)),
         }
       })
     ),
@@ -390,8 +358,6 @@ async function getHostsStats({ runningHosts, periodicity, xo }) {
 }
 
 async function getSrsStats({ periodicity, xo, xoObjects }) {
-  const lastNValues = DAYS_TO_KEEP[periodicity]
-
   return orderBy(
     await asyncMapSettled(
       filter(xoObjects, obj => obj.type === 'SR' && obj.size > 0 && obj.$PBDs.length > 0),
@@ -405,23 +371,18 @@ async function getSrsStats({ periodicity, xo, xoObjects }) {
           name += ` (${container.name_label})`
         }
 
-        const stats = getDeepLastValues(
-          (
-            await xo.getXapiSrStats(sr.id, GRANULARITY).catch(error => {
-              log.warn('Error on fetching SR stats', {
-                error,
-                srId: sr.id,
-              })
-              return {
-                stats: {},
-              }
-            })
-          ).stats,
-          lastNValues
-        )
+        const { stats } = await xo.getXapiSrStats(sr.id, GRANULARITY).catch(error => {
+          log.warn('Error on fetching SR stats', {
+            error,
+            srId: sr.id,
+          })
+          return {
+            stats: {},
+          }
+        })
 
-        const iopsRead = computeMean(stats.iops?.r)
-        const iopsWrite = computeMean(stats.iops?.w)
+        const iopsRead = computeMean(getLastDays(get(stats.iops, 'r'), periodicity))
+        const iopsWrite = computeMean(getLastDays(get(stats.iops, 'w'), periodicity))
 
         return {
           uuid: sr.uuid,
@@ -516,7 +477,7 @@ async function getHostsMissingPatches({ runningHosts, xo }) {
         .getXapi(host)
         .listMissingPatches(host._xapiId)
         .catch(error => {
-          log.warn('Error on fetching hosts missing patches', { error })
+          console.error('[WARN] error on fetching hosts missing patches:', JSON.stringify(error))
           return []
         })
 
@@ -780,7 +741,7 @@ class UsageReportPlugin {
       try {
         await this._sendReport(true)
       } catch (error) {
-        log.warn('Scheduled usage report error', { error })
+        console.error('[WARN] scheduled function:', (error && error.stack) || error)
       }
     })
 

packages/xo-server/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "xo-server",
-  "version": "5.124.0",
+  "version": "5.122.0",
   "license": "AGPL-3.0-or-later",
   "description": "Server part of Xen-Orchestra",
   "keywords": [
@@ -41,18 +41,18 @@
     "@vates/predicates": "^1.1.0",
     "@vates/read-chunk": "^1.2.0",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/backups": "^0.43.0",
+    "@xen-orchestra/backups": "^0.42.0",
     "@xen-orchestra/cron": "^1.0.6",
     "@xen-orchestra/defined": "^0.0.1",
     "@xen-orchestra/emit-async": "^1.0.0",
     "@xen-orchestra/fs": "^4.1.0",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/mixin": "^0.1.0",
-    "@xen-orchestra/mixins": "^0.13.0",
+    "@xen-orchestra/mixins": "^0.12.0",
     "@xen-orchestra/self-signed": "^0.1.3",
     "@xen-orchestra/template": "^0.1.0",
     "@xen-orchestra/vmware-explorer": "^0.3.0",
-    "@xen-orchestra/xapi": "^3.2.0",
+    "@xen-orchestra/xapi": "^3.1.0",
     "ajv": "^8.0.3",
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.0.1",
@@ -128,7 +128,7 @@
     "unzipper": "^0.10.5",
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
-    "vhd-lib": "^4.6.1",
+    "vhd-lib": "^4.5.0",
     "ws": "^8.2.3",
     "xdg-basedir": "^5.1.0",
     "xen-api": "^1.3.6",
@@ -136,7 +136,7 @@
     "xo-collection": "^0.5.0",
     "xo-common": "^0.8.0",
     "xo-remote-parser": "^0.9.2",
-    "xo-vmdk-to-vhd": "^2.5.6"
+    "xo-vmdk-to-vhd": "^2.5.5"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",

packages/xo-server/signin.pug

@@ -69,14 +69,3 @@ html
               button.btn.btn-block.btn-info
                 i.fa.fa-sign-in
                 |  Sign in
-    script.
-      (function () {
-        var d = document
-        var h = d.location.hash
-        d.querySelectorAll('a').forEach(a => {
-            a.href += h
-        })
-        d.querySelectorAll('form').forEach(form => {
-            form.action += h
-        })
-      })()

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

@@ -119,15 +119,7 @@ set.resolve = {
 
 // FIXME: set force to false per default when correctly implemented in
 // UI.
-export async function restart({
-  bypassBackupCheck = false,
-  host,
-  force = false,
-  suspendResidentVms,
-
-  bypassBlockedSuspend = force,
-  bypassCurrentVmCheck = force,
-}) {
+export async function restart({ bypassBackupCheck = false, host, force = true, suspendResidentVms }) {
   if (bypassBackupCheck) {
     log.warn('host.restart with argument "bypassBackupCheck" set to true', { hostId: host.id })
   } else {
@@ -135,9 +127,7 @@ export async function restart({
   }
 
   const xapi = this.getXapi(host)
-  return suspendResidentVms
-    ? xapi.host_smartReboot(host._xapiRef, bypassBlockedSuspend, bypassCurrentVmCheck)
-    : xapi.rebootHost(host._xapiId, force)
+  return suspendResidentVms ? xapi.host_smartReboot(host._xapiRef) : xapi.rebootHost(host._xapiId, force)
 }
 
 restart.description = 'restart the host'
@@ -147,14 +137,6 @@ restart.params = {
     type: 'boolean',
     optional: true,
   },
-  bypassBlockedSuspend: {
-    type: 'boolean',
-    optional: true,
-  },
-  bypassCurrentVmCheck: {
-    type: 'boolean',
-    optional: true,
-  },
   id: { type: 'string' },
   force: {
     type: 'boolean',
@@ -474,52 +456,3 @@ setControlDomainMemory.params = {
 setControlDomainMemory.resolve = {
   host: ['id', 'host', 'administrate'],
 }
-
-// -------------------------------------------------------------------
-/**
- *
- * @param {{host:HOST}} params
- * @returns null if plugin is not installed or don't have the method
- *          an object device: status on success
- */
-export function getSmartctlHealth({ host }) {
-  return this.getXapi(host).getSmartctlHealth(host._xapiId)
-}
-
-getSmartctlHealth.description = 'get smartctl health status'
-
-getSmartctlHealth.params = {
-  id: { type: 'string' },
-}
-
-getSmartctlHealth.resolve = {
-  host: ['id', 'host', 'view'],
-}
-
-/**
- *
- * @param {{host:HOST}} params
- * @returns null if plugin is not installed or don't have the method
- *          an object device: full device information on success
- */
-export function getSmartctlInformation({ host, deviceNames }) {
-  return this.getXapi(host).getSmartctlInformation(host._xapiId, deviceNames)
-}
-
-getSmartctlInformation.description = 'get smartctl information'
-
-getSmartctlInformation.params = {
-  id: { type: 'string' },
-
-  deviceNames: {
-    type: 'array',
-    items: {
-      type: 'string',
-    },
-    optional: true,
-  },
-}
-
-getSmartctlInformation.resolve = {
-  host: ['id', 'host', 'view'],
-}

packages/xo-server/src/api/sr.mjs

@@ -884,8 +884,6 @@ export const getAllUnhealthyVdiChainsLength = debounceWithKey(function getAllUnh
   return unhealthyVdiChainsLengthBySr
 }, 60e3)
 
-getAllUnhealthyVdiChainsLength.permission = 'admin'
-
 // -------------------------------------------------------------------
 
 export function getVdiChainsInfo({ sr }) {

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

@@ -5,7 +5,6 @@ import asyncMapSettled from '@xen-orchestra/async-map/legacy.js'
 import { Task } from '@xen-orchestra/mixins/Tasks.mjs'
 import concat from 'lodash/concat.js'
 import hrp from 'http-request-plus'
-import mapKeys from 'lodash/mapKeys.js'
 import { createLogger } from '@xen-orchestra/log'
 import { defer } from 'golike-defer'
 import { format } from 'json-rpc-peer'
@@ -623,8 +622,6 @@ warmMigration.params = {
 
 // -------------------------------------------------------------------
 
-const autoPrefix = (pfx, str) => (str.startsWith(pfx) ? str : pfx + str)
-
 export const set = defer(async function ($defer, params) {
   const VM = extract(params, 'VM')
   const xapi = this.getXapi(VM)
@@ -649,11 +646,6 @@ export const set = defer(async function ($defer, params) {
     await xapi.call('VM.set_suspend_SR', VM._xapiRef, suspendSr === null ? Ref.EMPTY : suspendSr._xapiRef)
   }
 
-  const xenStoreData = extract(params, 'xenStoreData')
-  if (xenStoreData !== undefined) {
-    await this.getXapiObject(VM).update_xenstore_data(mapKeys(xenStoreData, (v, k) => autoPrefix('vm-data/', k)))
-  }
-
   return xapi.editVm(vmId, params, async (limits, vm) => {
     const resourceSet = xapi.xo.getData(vm, 'resourceSet')
 
@@ -755,15 +747,6 @@ set.params = {
   blockedOperations: { type: 'object', optional: true, properties: { '*': { type: ['boolean', 'null', 'string'] } } },
 
   suspendSr: { type: ['string', 'null'], optional: true },
-
-  xenStoreData: {
-    description: 'properties that should be set or deleted (if null) in the VM XenStore',
-    optional: true,
-    type: 'object',
-    additionalProperties: {
-      type: ['null', 'string'],
-    },
-  },
 }
 
 set.resolve = {

packages/xo-server/src/api/vtpm.mjs

@@ -1,29 +0,0 @@
-export async function create({ vm }) {
-  const xapi = this.getXapi(vm)
-  const vtpmRef = await xapi.VTPM_create({ VM: vm._xapiRef })
-  return xapi.getField('VTPM', vtpmRef, 'uuid')
-}
-
-create.description = 'create a VTPM'
-
-create.params = {
-  id: { type: 'string' },
-}
-
-create.resolve = {
-  vm: ['id', 'VM', 'administrate'],
-}
-
-export async function destroy({ vtpm }) {
-  await this.getXapi(vtpm).call('VTPM.destroy', vtpm._xapiRef)
-}
-
-destroy.description = 'destroy a VTPM'
-
-destroy.params = {
-  id: { type: 'string' },
-}
-
-destroy.resolve = {
-  vtpm: ['id', 'VTPM', 'administrate'],
-}

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

@@ -118,7 +118,6 @@ const TRANSFORMS = {
       },
       suspendSr: link(obj, 'suspend_image_SR'),
       zstdSupported: obj.restrictions.restrict_zstd_export === 'false',
-      vtpmSupported: obj.restrictions.restrict_vtpm === 'false',
 
       // TODO
       // - ? networks = networksByPool.items[pool.id] (network.$pool.id)
@@ -414,7 +413,6 @@ const TRANSFORMS = {
       suspendSr: link(obj, 'suspend_SR'),
       tags: obj.tags,
       VIFs: link(obj, 'VIFs'),
-      VTPMs: link(obj, 'VTPMs'),
       virtualizationMode: domainType,
 
       // deprecated, use pvDriversVersion instead
@@ -843,14 +841,6 @@ const TRANSFORMS = {
       vgpus: link(obj, 'VGPUs'),
     }
   },
-
-  vtpm(obj) {
-    return {
-      type: 'VTPM',
-
-      vm: link(obj, 'VM'),
-    }
-  },
 }
 
 // ===================================================================

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

@@ -12,7 +12,6 @@ import mixin from '@xen-orchestra/mixin/legacy.js'
 import ms from 'ms'
 import noop from 'lodash/noop.js'
 import once from 'lodash/once.js'
-import pick from 'lodash/pick.js'
 import tarStream from 'tar-stream'
 import uniq from 'lodash/uniq.js'
 import { asyncMap } from '@xen-orchestra/async-map'
@@ -1329,10 +1328,7 @@ export default class Xapi extends XapiBase {
         )
       ),
     ])
-    // only add the MBR for windows VM
-    if (vm.platform.viridian === 'true') {
-      buffer = addMbr(buffer)
-    }
+    buffer = addMbr(buffer)
     const vdi = await this._getOrWaitObject(
       await this.VDI_create({
         name_label: 'XO CloudConfigDrive',
@@ -1429,34 +1425,4 @@ export default class Xapi extends XapiBase {
       }
     }
   }
-
-  async getSmartctlHealth(hostId) {
-    try {
-      return JSON.parse(await this.call('host.call_plugin', this.getObject(hostId).$ref, 'smartctl.py', 'health', {}))
-    } catch (error) {
-      if (error.code === 'XENAPI_MISSING_PLUGIN' || error.code === 'UNKNOWN_XENAPI_PLUGIN_FUNCTION') {
-        return null
-      } else {
-        throw error
-      }
-    }
-  }
-
-  async getSmartctlInformation(hostId, deviceNames) {
-    try {
-      const informations = JSON.parse(
-        await this.call('host.call_plugin', this.getObject(hostId).$ref, 'smartctl.py', 'information', {})
-      )
-      if (deviceNames === undefined) {
-        return informations
-      }
-      return pick(informations, deviceNames)
-    } catch (error) {
-      if (error.code === 'XENAPI_MISSING_PLUGIN' || error.code === 'UNKNOWN_XENAPI_PLUGIN_FUNCTION') {
-        return null
-      } else {
-        throw error
-      }
-    }
-  }
 }

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

@@ -59,7 +59,7 @@ const listMissingPatches = debounceWithKey(_listMissingPatches, LISTING_DEBOUNCE
 // =============================================================================
 
 export default {
-  // raw { uuid: patch } map translated from updates.ops.xenserver.com/xenserver/updates.xml
+  // raw { uuid: patch } map translated from updates.xensource.com/XenServer/updates.xml
   // FIXME: should be static
   @decorateWith(debounceWithKey, 24 * 60 * 60 * 1000, function () {
     return this
@@ -405,11 +405,6 @@ export default {
   },
 
   _poolWideInstall: deferrable(async function ($defer, patches, xsCredentials) {
-    // New XS patching system: https://support.citrix.com/article/CTX473972/upcoming-changes-in-xencenter
-    if (xsCredentials?.username === undefined || xsCredentials?.apikey === undefined) {
-      throw new Error('XenServer credentials not found. See https://xen-orchestra.com/docs/updater.html#xenserver-updates')
-    }
-
     // Legacy XS patches
     if (!useUpdateSystem(this.pool.$master)) {
       // for each patch: pool_patch.pool_apply
@@ -425,6 +420,11 @@ export default {
     }
     // ----------
 
+    // New XS patching system: https://support.citrix.com/article/CTX473972/upcoming-changes-in-xencenter
+    if (xsCredentials?.username === undefined || xsCredentials?.apikey === undefined) {
+      throw new Error('XenServer credentials not found. See https://xen-orchestra.com/docs/updater.html#xenserver-updates')
+    }
+
     // for each patch: pool_update.introduce → pool_update.pool_apply
     for (const p of patches) {
       const [vdi] = await Promise.all([this._uploadPatch($defer, p.uuid, xsCredentials), this._ejectToolsIsos()])
@@ -493,7 +493,7 @@ export default {
   },
 
   @decorateWith(deferrable)
-  async rollingPoolUpdate($defer, { xsCredentials } = {}) {
+  async rollingPoolUpdate($defer) {
     const isXcp = _isXcp(this.pool.$master)
 
     if (this.pool.ha_enabled) {
@@ -530,7 +530,7 @@ export default {
     // On XS/CH, start by installing patches on all hosts
     if (!isXcp) {
       log.debug('Install patches')
-      await this.installPatches({ xsCredentials })
+      await this.installPatches()
     }
 
     // Remember on which hosts the running VMs are
@@ -629,13 +629,7 @@ export default {
         continue
       }
 
-      const residentVms = host.$resident_VMs.map(vm => vm.uuid)
-
       for (const vmId of vmIds) {
-        if (residentVms.includes(vmId)) {
-          continue
-        }
-
         try {
           await this.migrateVm(vmId, this, hostId)
         } catch (err) {

packages/xo-server/src/xapi/mixins/storage.mjs

@@ -49,19 +49,18 @@ export default {
     await this._unplugPbd(this.getObject(id))
   },
 
-  _getVdiChainsInfo(uuid, childrenMap, cache, resultContainer) {
+  _getVdiChainsInfo(uuid, childrenMap, cache) {
     let info = cache[uuid]
     if (info === undefined) {
       const children = childrenMap[uuid]
       const unhealthyLength = children !== undefined && children.length === 1 ? 1 : 0
-      resultContainer.nUnhealthyVdis += unhealthyLength
       const vdi = this.getObjectByUuid(uuid, undefined)
       if (vdi === undefined) {
         info = { unhealthyLength, missingParent: uuid }
       } else {
         const parent = vdi.sm_config['vhd-parent']
         if (parent !== undefined) {
-          info = this._getVdiChainsInfo(parent, childrenMap, cache, resultContainer)
+          info = this._getVdiChainsInfo(parent, childrenMap, cache)
           info.unhealthyLength += unhealthyLength
         } else {
           info = { unhealthyLength }
@@ -77,13 +76,12 @@ export default {
     const unhealthyVdis = { __proto__: null }
     const children = groupBy(vdis, 'sm_config.vhd-parent')
     const vdisWithUnknownVhdParent = { __proto__: null }
-    const resultContainer = { nUnhealthyVdis: 0 }
 
     const cache = { __proto__: null }
     forEach(vdis, vdi => {
       if (vdi.managed && !vdi.is_a_snapshot) {
         const { uuid } = vdi
-        const { unhealthyLength, missingParent } = this._getVdiChainsInfo(uuid, children, cache, resultContainer)
+        const { unhealthyLength, missingParent } = this._getVdiChainsInfo(uuid, children, cache)
 
         if (unhealthyLength !== 0) {
           unhealthyVdis[uuid] = unhealthyLength
@@ -97,7 +95,6 @@ export default {
     return {
       vdisWithUnknownVhdParent,
       unhealthyVdis,
-      ...resultContainer,
     }
   },
 

packages/xo-server/src/xo-mixins/authentication.mjs

@@ -7,7 +7,6 @@ import { parseDuration } from '@vates/parse-duration'
 import patch from '../patch.mjs'
 import { Tokens } from '../models/token.mjs'
 import { forEach, generateToken } from '../utils.mjs'
-import { replace } from '../sensitive-values.mjs'
 
 // ===================================================================
 
@@ -137,52 +136,36 @@ export default class {
   }
 
   async authenticateUser(credentials, userData) {
-    const { tasks } = this._app
-    const task = await tasks.create(
-      {
-        type: 'xo:authentication:authenticateUser',
-        name: 'XO user authentication',
-        credentials: replace(credentials),
-        userData,
-      },
-      {
-        // only keep trace of failed attempts
-        clearLogOnSuccess: true,
-      }
-    )
+    // don't even attempt to authenticate with empty password
+    const { password } = credentials
+    if (password === '') {
+      throw new Error('empty password')
+    }
 
-    return task.run(async () => {
-      // don't even attempt to authenticate with empty password
-      const { password } = credentials
-      if (password === '') {
-        throw new Error('empty password')
-      }
+    // TODO: remove when email has been replaced by username.
+    if (credentials.email) {
+      credentials.username = credentials.email
+    } else if (credentials.username) {
+      credentials.email = credentials.username
+    }
 
-      // TODO: remove when email has been replaced by username.
-      if (credentials.email) {
-        credentials.username = credentials.email
-      } else if (credentials.username) {
-        credentials.email = credentials.username
-      }
+    const failures = this._failures
 
-      const failures = this._failures
+    const { username } = credentials
+    const now = Date.now()
+    let lastFailure
+    if (username && (lastFailure = failures[username]) && lastFailure + this._throttlingDelay > now) {
+      throw new Error('too fast authentication tries')
+    }
 
-      const { username } = credentials
-      const now = Date.now()
-      let lastFailure
-      if (username && (lastFailure = failures[username]) && lastFailure + this._throttlingDelay > now) {
-        throw new Error('too fast authentication tries')
-      }
+    const result = await this._authenticateUser(credentials, userData)
+    if (result === undefined) {
+      failures[username] = now
+      throw invalidCredentials()
+    }
 
-      const result = await this._authenticateUser(credentials, userData)
-      if (result === undefined) {
-        failures[username] = now
-        throw invalidCredentials()
-      }
-
-      delete failures[username]
-      return result
-    })
+    delete failures[username]
+    return result
   }
 
   // -----------------------------------------------------------------

packages/xo-server/src/xo-mixins/pool.mjs

@@ -62,14 +62,11 @@ export default class Pools {
       }
       const patchesName = await Promise.all([targetXapi.findPatches(targetRequiredPatches), ...findPatchesPromises])
 
-      const { xsCredentials } = _app.apiContext.user.preferences
-
       // Install patches in parallel.
       const installPatchesPromises = []
       installPatchesPromises.push(
         targetXapi.installPatches({
           patches: patchesName[0],
-          xsCredentials,
         })
       )
       let i = 1
@@ -77,7 +74,6 @@ export default class Pools {
         installPatchesPromises.push(
           sourceXapis[sourceId].installPatches({
             patches: patchesName[i++],
-            xsCredentials,
           })
         )
       }

packages/xo-server/src/xo-mixins/xen-servers.mjs

@@ -686,7 +686,7 @@ export default class XenServers {
       $defer(() => app.loadPlugin('load-balancer'))
     }
 
-    await this.getXapi(pool).rollingPoolUpdate({ xsCredentials: app.apiContext.user.preferences.xsCredentials })
+    await this.getXapi(pool).rollingPoolUpdate()
   }
 }
 

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

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-vmdk-to-vhd",
-  "version": "2.5.6",
+  "version": "2.5.5",
   "license": "AGPL-3.0-or-later",
   "description": "JS lib reading and writing .vmdk and .ova files",
   "keywords": [
@@ -26,7 +26,7 @@
     "pako": "^2.0.4",
     "promise-toolbox": "^0.21.0",
     "tar-stream": "^2.2.0",
-    "vhd-lib": "^4.6.1",
+    "vhd-lib": "^4.5.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {

packages/xo-web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "xo-web",
-  "version": "5.126.0",
+  "version": "5.124.1",
   "license": "AGPL-3.0-or-later",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [
@@ -137,7 +137,7 @@
     "xo-common": "^0.8.0",
     "xo-lib": "^0.11.1",
     "xo-remote-parser": "^0.9.2",
-    "xo-vmdk-to-vhd": "^2.5.6"
+    "xo-vmdk-to-vhd": "^2.5.5"
   },
   "scripts": {
     "build": "GIT_HEAD=$(git rev-parse HEAD) NODE_ENV=production gulp build",

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

@@ -6,7 +6,7 @@ import React from 'react'
 const Icon = ({ icon, size = 1, color, fixedWidth, ...props }) => {
   props.className = classNames(
     props.className,
-    icon != null ? `xo-icon-${icon}` : 'fa', // Misaligned problem modification: if no icon or null, apply 'fa'
+    icon !== undefined ? `xo-icon-${icon}` : 'fa', // Without icon prop, is a placeholder.
     isInteger(size) ? `fa-${size}x` : `fa-${size}`,
     color,
     fixedWidth && 'fa-fw'

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

@@ -241,8 +241,7 @@ const messages = {
   closeTunnel: 'Close tunnel',
   createSupportTicket: 'Create a support ticket',
   restartXoServer: 'Restart XO Server',
-  restartXoServerConfirm:
-    'Restarting XO Server will interrupt any backup job or XO task that is currently running. Xen Orchestra will also be unavailable for a few seconds. Are you sure you want to restart XO Server?',
+  restartXoServerConfirm: 'Restarting XO Server will interrupt any backup job or XO task that is currently running. Xen Orchestra will also be unavailable for a few seconds. Are you sure you want to restart XO Server?',
   openTunnel: 'Open tunnel',
   supportCommunity: 'The XOA check and the support tunnel are available in XOA.',
   supportTunnel: 'Support tunnel',
@@ -963,13 +962,9 @@ const messages = {
   enableHostLabel: 'Enable',
   disableHostLabel: 'Disable',
   restartHostAgent: 'Restart toolstack',
-  smartRebootBypassCurrentVmCheck:
-    'As the XOA is hosted on the host that is scheduled for a reboot, it will also be restarted. Consequently, XO won\'t be able to resume VMs, and VMs with the "Protect from accidental shutdown" option enabled will not have this option reactivated automatically.',
   smartRebootHostLabel: 'Smart reboot',
   smartRebootHostTooltip: 'Suspend resident VMs, reboot host and resume VMs automatically',
   forceRebootHostLabel: 'Force reboot',
-  forceSmartRebootHost:
-    'Smart Reboot failed because {nVms, number} VM{nVms, plural, one {} other {s}} ha{nVms, plural, one {s} other {ve}} {nVms, plural, one {its} other {their}} Suspend operation blocked. Would you like to force?',
   rebootHostLabel: 'Reboot',
   noHostsAvailableErrorTitle: 'Error while restarting host',
   noHostsAvailableErrorMessage:
@@ -985,7 +980,6 @@ const messages = {
   // ----- host stat tab -----
   statLoad: 'Load average',
   // ----- host advanced tab -----
-  disksSystemHealthy: 'All disks are healthy ✅',
   editHostIscsiIqnTitle: 'Edit iSCSI IQN',
   editHostIscsiIqnMessage:
     'Are you sure you want to edit the iSCSI IQN? This may result in failures connecting to existing SRs if the host is attached to iSCSI SRs.',
@@ -1036,7 +1030,6 @@ const messages = {
   hostRemoteSyslog: 'Remote syslog',
   hostIommu: 'IOMMU',
   hostNoCertificateInstalled: 'No certificates installed on this host',
-  smartctlPluginNotInstalled: 'Smartctl plugin not installed',
   supplementalPacks: 'Installed supplemental packs',
   supplementalPackNew: 'Install new supplemental pack',
   supplementalPackPoolNew: 'Install supplemental pack on every host',
@@ -1047,7 +1040,6 @@ const messages = {
   supplementalPackInstallErrorMessage: 'The installation of the supplemental pack failed.',
   supplementalPackInstallSuccessTitle: 'Installation success',
   supplementalPackInstallSuccessMessage: 'Supplemental pack successfully installed.',
-  systemDisksHealth: 'System disks health',
   uniqueHostIscsiIqnInfo: 'The iSCSI IQN must be unique. ',
   // ----- Host net tabs -----
   networkCreateButton: 'Add a network',
@@ -2205,10 +2197,11 @@ const messages = {
   pwdChangeError: 'Incorrect password',
   pwdChangeErrorBody: 'The old password provided is incorrect. Your password has not been changed.',
   changePasswordOk: 'OK',
-  forgetTokens: 'Forget all authentication tokens',
-  forgetTokensExplained: 'This prevents authenticating with existing tokens but the one used by the current session',
-  forgetTokensSuccess: 'Successfully forgot authentication tokens',
-  forgetTokensError: 'Error while forgetting authentication tokens',
+  forgetTokens: 'Forget all connection tokens',
+  forgetTokensExplained:
+    'This will prevent other clients from authenticating with existing tokens but will not kill active sessions',
+  forgetTokensSuccess: 'Successfully forgot connection tokens',
+  forgetTokensError: 'Error while forgetting connection tokens',
   sshKeys: 'SSH keys',
   newAuthToken: 'New token',
   newSshKey: 'New SSH key',

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

@@ -299,63 +299,6 @@ Vdi.defaultProps = {
 
 // ===================================================================
 
-export const Pif = decorate([
-  connectStore(() => {
-    const getObject = createGetObject()
-    const getNetwork = createGetObject(createSelector(getObject, pif => get(() => pif.$network)))
-
-    // FIXME: props.self ugly workaround to get object as a self user
-    return (state, props) => ({
-      pif: getObject(state, props, props.self),
-      network: getNetwork(state, props),
-    })
-  }),
-  ({ id, showNetwork, pif, network }) => {
-    if (pif === undefined) {
-      return unknowItem(id, 'PIF')
-    }
-
-    const { carrier, device, deviceName, vlan } = pif
-    const showExtraInfo = deviceName || vlan !== -1 || (showNetwork && network !== undefined)
-
-    return (
-      <span>
-        <Icon icon='network' color={carrier ? 'text-success' : 'text-danger'} /> {device}
-        {showExtraInfo && (
-          <span>
-            {' '}
-            ({deviceName}
-            {vlan !== -1 && (
-              <span>
-                {' '}
-                -{' '}
-                {_('keyValue', {
-                  key: _('pifVlanLabel'),
-                  value: vlan,
-                })}
-              </span>
-            )}
-            {showNetwork && network !== undefined && <span> - {network.name_label}</span>})
-          </span>
-        )}
-      </span>
-    )
-  },
-])
-
-Pif.propTypes = {
-  id: PropTypes.string.isRequired,
-  self: PropTypes.bool,
-  showNetwork: PropTypes.bool,
-}
-
-Pif.defaultProps = {
-  self: false,
-  showNetwork: false,
-}
-
-// ===================================================================
-
 export const Network = decorate([
   connectStore(() => {
     const getObject = createGetObject()
@@ -618,8 +561,24 @@ const xoItemToRender = {
   ),
 
   // PIF.
-  PIF: props => <Pif {...props} />,
-
+  PIF: ({ carrier, device, deviceName, vlan }) => (
+    <span>
+      <Icon icon='network' color={carrier ? 'text-success' : 'text-danger'} /> {device}
+      {(deviceName !== '' || vlan !== -1) && (
+        <span>
+          {' '}
+          ({deviceName}
+          {deviceName !== '' && vlan !== -1 && ' - '}
+          {vlan !== -1 &&
+            _('keyValue', {
+              key: _('pifVlanLabel'),
+              value: vlan,
+            })}
+          )
+        </span>
+      )}
+    </span>
+  ),
   // Tags.
   tag: tag => (
     <span>

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

@@ -251,7 +251,6 @@ class GenericSelect extends React.Component {
             ? `${option.xoItem.type}-resourceSet`
             : undefined,
         memoryFree: option.xoItem.type === 'host' || undefined,
-        showNetwork: true,
       })}
     </span>
   )

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

@@ -16,7 +16,6 @@ import {
   incorrectState,
   noHostsAvailable,
   operationBlocked,
-  operationFailed,
   vmLacksFeature,
 } from 'xo-common/api-errors'
 
@@ -109,13 +108,7 @@ const xo = invoke(() => {
     credentials: { token },
   })
 
-  xo.on('authenticationFailure', error => {
-    console.warn('authenticationFailure', error)
-
-    if (error.name !== 'ConnectionError') {
-      signOut(error)
-    }
-  })
+  xo.on('authenticationFailure', signOut)
   xo.on('scheduledAttempt', ({ delay }) => {
     console.warn('next attempt in %s ms', delay)
   })
@@ -828,89 +821,42 @@ export const setRemoteSyslogHost = (host, syslogDestination) =>
 export const setRemoteSyslogHosts = (hosts, syslogDestination) =>
   Promise.all(map(hosts, host => setRemoteSyslogHost(host, syslogDestination)))
 
-export const restartHost = async (
-  host,
-  force = false,
-  suspendResidentVms = false,
-  bypassBlockedSuspend = false,
-  bypassCurrentVmCheck = false
-) => {
-  await confirm({
+export const restartHost = (host, force = false, suspendResidentVms = false) =>
+  confirm({
     title: _('restartHostModalTitle'),
     body: _('restartHostModalMessage'),
-  })
-  return _restartHost({ host, force, suspendResidentVms, bypassBlockedSuspend, bypassCurrentVmCheck })
-}
-
-const _restartHost = async ({ host, ...opts }) => {
-  opts = { ...opts, id: resolveId(host) }
-
-  try {
-    await _call('host.restart', opts)
-  } catch (error) {
-    if (cantSuspend(error)) {
-      await confirm({
-        body: (
-          <p>
-            <Icon icon='alarm' /> {_('forceSmartRebootHost', { nVms: error.data.actual.length })}
-          </p>
-        ),
-        title: _('restartHostModalTitle'),
-      })
-      return _restartHost({ ...opts, host, bypassBlockedSuspend: true })
-    }
-
-    if (xoaOnHost(error)) {
-      await confirm({
-        body: (
-          <p>
-            <Icon icon='alarm' /> {_('smartRebootBypassCurrentVmCheck')}
-          </p>
-        ),
-        title: _('restartHostModalTitle'),
-      })
-      return _restartHost({ ...opts, host, bypassCurrentVmCheck: true })
-    }
-
-    if (backupIsRunning(error, host.$poolId)) {
-      await confirm({
-        body: (
-          <p className='text-warning'>
-            <Icon icon='alarm' /> {_('bypassBackupHostModalMessage')}
-          </p>
-        ),
-        title: _('restartHostModalTitle'),
-      })
-      return _restartHost({ ...opts, host, bypassBackupCheck: true })
-    }
-
-    if (noHostsAvailableErrCheck(error)) {
-      alert(_('noHostsAvailableErrorTitle'), _('noHostsAvailableErrorMessage'))
-    }
-    throw error
-  }
-}
-
-// ---- Restart Host errors
-const cantSuspend = err =>
-  err !== undefined &&
-  incorrectState.is(err, {
-    object: 'suspendBlocked',
-  })
-const xoaOnHost = err =>
-  err !== undefined &&
-  operationFailed.is(err, {
-    code: 'xoaOnHost',
-  })
-const backupIsRunning = (err, poolId) =>
-  err !== undefined &&
-  (forbiddenOperation.is(err, {
-    reason: `A backup may run on the pool: ${poolId}`,
-  }) ||
-    forbiddenOperation.is(err, {
-      reason: `A backup is running on the pool: ${poolId}`,
-    }))
-const noHostsAvailableErrCheck = err => err !== undefined && noHostsAvailable.is(err)
+  }).then(
+    () =>
+      _call('host.restart', { id: resolveId(host), force, suspendResidentVms })
+        .catch(async error => {
+          if (
+            forbiddenOperation.is(error, {
+              reason: `A backup may run on the pool: ${host.$poolId}`,
+            }) ||
+            forbiddenOperation.is(error, {
+              reason: `A backup is running on the pool: ${host.$poolId}`,
+            })
+          ) {
+            await confirm({
+              body: (
+                <p className='text-warning'>
+                  <Icon icon='alarm' /> {_('bypassBackupHostModalMessage')}
+                </p>
+              ),
+              title: _('restartHostModalTitle'),
+            })
+            return _call('host.restart', { id: resolveId(host), force, suspendResidentVms, bypassBackupCheck: true })
+          }
+          throw error
+        })
+        .catch(error => {
+          if (noHostsAvailable.is(error)) {
+            alert(_('noHostsAvailableErrorTitle'), _('noHostsAvailableErrorMessage'))
+          }
+          throw error
+        }),
+    noop
+  )
 
 export const restartHosts = (hosts, force = false) => {
   const nHosts = size(hosts)
@@ -1078,11 +1024,6 @@ export const isHyperThreadingEnabledHost = host =>
     id: resolveId(host),
   })
 
-export const getSmartctlHealth = host => _call('host.getSmartctlHealth', { id: resolveId(host) })
-
-export const getSmartctlInformation = (host, deviceNames) =>
-  _call('host.getSmartctlInformation', { id: resolveId(host), deviceNames })
-
 export const installCertificateOnHost = (id, props) => _call('host.installCertificate', { id, ...props })
 
 export const setControlDomainMemory = (id, memory) => _call('host.setControlDomainMemory', { id, memory })

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

@@ -1,6 +1,5 @@
 import _ from 'intl'
 import ActionButton from 'action-button'
-import BulkIcons from 'bulk-icons'
 import Component from 'base-component'
 import Copiable from 'copiable'
 import decorate from 'apply-decorators'
@@ -34,8 +33,6 @@ import {
   isHyperThreadingEnabledHost,
   isNetDataInstalledOnHost,
   getPlugin,
-  getSmartctlHealth,
-  getSmartctlInformation,
   restartHost,
   setControlDomainMemory,
   setHostsMultipathing,
@@ -76,7 +73,7 @@ const downloadLogs = async uuid => {
 const forceReboot = host => restartHost(host, true)
 
 const smartReboot = ALLOW_SMART_REBOOT
-  ? host => restartHost(host, false, true, false, false) // don't force, suspend resident VMs, don't bypass blocked suspend, don't bypass current VM check
+  ? host => restartHost(host, false, true) // don't force, suspend resident VMs
   : () => {}
 
 const formatPack = ({ name, author, description, version }, key) => (
@@ -164,36 +161,17 @@ MultipathableSrs.propTypes = {
 })
 export default class extends Component {
   async componentDidMount() {
-    const { host } = this.props
     const plugin = await getPlugin('netdata')
     const isNetDataPluginCorrectlySet = plugin !== undefined && plugin.loaded
     this.setState({ isNetDataPluginCorrectlySet })
     if (isNetDataPluginCorrectlySet) {
       this.setState({
-        isNetDataPluginInstalledOnHost: await isNetDataInstalledOnHost(host),
+        isNetDataPluginInstalledOnHost: await isNetDataInstalledOnHost(this.props.host),
       })
     }
 
-    const smartctlHealth = await getSmartctlHealth(host)
-    const isSmartctlHealthEnabled = smartctlHealth !== null
-    const smartctlUnhealthyDevices = isSmartctlHealthEnabled
-      ? Object.keys(smartctlHealth).filter(deviceName => smartctlHealth[deviceName] !== 'PASSED')
-      : undefined
-
-    let unhealthyDevicesAlerts
-    if (smartctlUnhealthyDevices?.length > 0) {
-      const unhealthyDeviceInformations = await getSmartctlInformation(host, smartctlUnhealthyDevices)
-      unhealthyDevicesAlerts = map(unhealthyDeviceInformations, (value, key) => ({
-        level: 'warning',
-        render: <pre>{_('keyValue', { key, value: JSON.stringify(value, null, 2) })}</pre>,
-      }))
-    }
-
     this.setState({
-      isHtEnabled: await isHyperThreadingEnabledHost(host).catch(() => null),
-      isSmartctlHealthEnabled,
-      smartctlUnhealthyDevices,
-      unhealthyDevicesAlerts,
+      isHtEnabled: await isHyperThreadingEnabledHost(this.props.host),
     })
   }
 
@@ -255,14 +233,7 @@ export default class extends Component {
 
   render() {
     const { controlDomain, host, pcis, pgpus, schedGran } = this.props
-    const {
-      isHtEnabled,
-      isNetDataPluginInstalledOnHost,
-      isNetDataPluginCorrectlySet,
-      isSmartctlHealthEnabled,
-      unhealthyDevicesAlerts,
-      smartctlUnhealthyDevices,
-    } = this.state
+    const { isHtEnabled, isNetDataPluginInstalledOnHost, isNetDataPluginCorrectlySet } = this.state
 
     const _isXcpNgHost = host.productBrand === 'XCP-ng'
 
@@ -541,21 +512,6 @@ export default class extends Component {
                     {host.bios_strings['bios-vendor']} ({host.bios_strings['bios-version']})
                   </td>
                 </tr>
-                <tr>
-                  <th>{_('systemDisksHealth')}</th>
-                  <td>
-                    {isSmartctlHealthEnabled !== undefined &&
-                      (isSmartctlHealthEnabled ? (
-                        smartctlUnhealthyDevices?.length === 0 ? (
-                          _('disksSystemHealthy')
-                        ) : (
-                          <BulkIcons alerts={unhealthyDevicesAlerts ?? []} />
-                        )
-                      ) : (
-                        _('smartctlPluginNotInstalled')
-                      ))}
-                  </td>
-                </tr>
               </tbody>
             </table>
             <br />

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

@@ -10,7 +10,7 @@ import { CustomFields } from 'custom-fields'
 import { createGetObjectsOfType } from 'selectors'
 import { createSelector } from 'reselect'
 import { createSrUnhealthyVdiChainsLengthSubscription, deleteSr, reclaimSrSpace, toggleSrMaintenanceMode } from 'xo'
-import { flowRight, isEmpty, keys } from 'lodash'
+import { flowRight, isEmpty, keys, sum, values } from 'lodash'
 
 // ===================================================================
 
@@ -44,11 +44,11 @@ const UnhealthyVdiChains = flowRight(
   connectStore(() => ({
     vdis: createGetObjectsOfType('VDI').pick(createSelector((_, props) => props.chains?.unhealthyVdis, keys)),
   }))
-)(({ chains: { nUnhealthyVdis, unhealthyVdis } = {}, vdis }) =>
+)(({ chains: { unhealthyVdis } = {}, vdis }) =>
   isEmpty(vdis) ? null : (
     <div>
       <hr />
-      <h3>{_('srUnhealthyVdiTitle', { total: nUnhealthyVdis })}</h3>
+      <h3>{_('srUnhealthyVdiTitle', { total: sum(values(unhealthyVdis)) })}</h3>
       <SortedTable collection={vdis} columns={COLUMNS} stateUrlParam='s_unhealthy_vdis' userData={unhealthyVdis} />
     </div>
   )