changelog

vatesfr · Sep 9, 2024 · 4a00286 · 4a00286
1 parent 9437476
commit 4a00286
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -19,6 +19,7 @@
 - [V2V] Fix computation of `memory_static_max`
 - **XO 6**:
   - [Dashboard] Display backup issues data (PR [#7974](https://github.com/vatesfr/xen-orchestra/pull/7974))
+- [REST API] Add S3 backup repository information in the `/rest/v0/dashboard` endpoint (PR [#7978](https://github.com/vatesfr/xen-orchestra/pull/7978))
 
 ### Bug fixes
 

diff --git a/packages/xo-server/src/xo-mixins/remotes.mjs b/packages/xo-server/src/xo-mixins/remotes.mjs
@@ -174,16 +174,16 @@ export default class {
             })
           : this.getRemoteHandler(remote.id).then(handler => handler.getInfo())
 
-      try {
-        const sizeUsedForBackup = await Disposable.use(this._app.getBackupsRemoteAdapter(remote), adapter =>
-          adapter.getTotalBackupSize()
-        ).catch(noop)
+      const sizeUsedForBackups = await Disposable.use(this._app.getBackupsRemoteAdapter(remote), adapter =>
+        adapter.getTotalBackupSize()
+      ).catch(noop)
 
+      try {
         await timeout.call(
           promise.then(info => {
             remotesInfo[remote.id] = {
               ...info,
-              sizeUsedForBackup,
+              sizeUsedForBackups,
               encryption,
             }
           }),

diff --git a/packages/xo-server/src/xo-mixins/rest-api.mjs b/packages/xo-server/src/xo-mixins/rest-api.mjs
@@ -250,14 +250,14 @@ async function _getDashboardStats(app) {
         continue
       }
 
-      const sizeUsedForBackup = remoteInfo.sizeUsedForBackup ?? 0
+      const sizeUsedForBackups = remoteInfo.sizeUsedForBackups ?? 0
       const isS3 = type === 's3'
       const target = isS3 ? backupRepositoriesSize.s3 : backupRepositoriesSize.other
 
-      target.backups += sizeUsedForBackup
+      target.backups += sizeUsedForBackups
       if (!isS3) {
         target.available += remoteInfo.available
-        target.other += remoteInfo.used - sizeUsedForBackup
+        target.other += remoteInfo.used - sizeUsedForBackups
         target.total += remoteInfo.size
         target.used += remoteInfo.used
       }