From 9937c26fff9b8ba0af1fa170aa2d28bbf2d81f07 Mon Sep 17 00:00:00 2001 From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com> Date: Wed, 20 Aug 2025 12:15:31 +0530 Subject: [PATCH 1/2] Don't show backup storage in list_capacity for dummy plugin or if backup_framework is disabled --- .../java/org/apache/cloudstack/backup/DummyBackupProvider.java | 2 +- .../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java index 05b4b52ccb83..48082c1c8a45 100644 --- a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java +++ b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java @@ -191,7 +191,7 @@ public boolean supportsInstanceFromBackup() { @Override public Pair getBackupStorageStats(Long zoneId) { - return new Pair<>(8L * 1024 * 1024 * 1024, 10L * 1024 * 1024 * 1024); + return new Pair<>(0L, 0L); } @Override diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index 2682d53dd200..112626adf4fe 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -2161,6 +2161,9 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails) @Override public CapacityVO getBackupStorageUsedStats(Long zoneId) { + if (isDisabled(zoneId)) { + return new CapacityVO(null, zoneId, null, null, 0L, 0L, Capacity.CAPACITY_TYPE_BACKUP_STORAGE); + } final BackupProvider backupProvider = getBackupProvider(zoneId); Pair backupUsage = backupProvider.getBackupStorageStats(zoneId); return new CapacityVO(null, zoneId, null, null, backupUsage.first(), backupUsage.second(), Capacity.CAPACITY_TYPE_BACKUP_STORAGE); From 1ce8709f71924b08ff2cc094e06adc253aaf92ff Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Wed, 3 Sep 2025 13:10:17 +0530 Subject: [PATCH 2/2] Fix the tile to full size --- ui/src/views/dashboard/CapacityDashboard.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/views/dashboard/CapacityDashboard.vue b/ui/src/views/dashboard/CapacityDashboard.vue index 9b3746288863..bf25b706306a 100644 --- a/ui/src/views/dashboard/CapacityDashboard.vue +++ b/ui/src/views/dashboard/CapacityDashboard.vue @@ -673,6 +673,7 @@ export default { .dashboard-storage { width: 100%; + min-height: 370px; overflow-x:hidden; overflow-y: scroll; max-height: 370px;