Merge 72bcc1e into 805196e

Author: MyCodeIsAmazing

ydb/core/viewer/json_tenantinfo.h

@@ -628,10 +628,16 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
                         tenant.SetStorageAllocatedLimit(storageAllocatedLimit);
                         tenant.SetStorageMinAvailableSize(storageMinAvailableSize);
                         tenant.SetStorageGroups(storageGroups);
+
                         auto& ssdUsage = *tenant.AddStorageUsage();
                         ssdUsage.SetType(NKikimrViewer::TStorageUsage::SSD);
-                        ssdUsage.SetSize(storageAllocatedSize);
-                        ssdUsage.SetLimit(storageAllocatedLimit);
+                        if (tenant.databasequotas().data_size_hard_quota() && tenant.GetMetrics().GetStorage()) {
+                            ssdUsage.SetSize(tenant.GetMetrics().GetStorage());
+                            ssdUsage.SetLimit(tenant.databasequotas().data_size_hard_quota());
+                        } else {
+                            ssdUsage.SetSize(storageAllocatedSize);
+                            ssdUsage.SetLimit(storageAllocatedLimit);
+                        }
                         // TODO(andrew-rykov)
                         auto& hddUsage = *tenant.AddStorageUsage();
                         hddUsage.SetType(NKikimrViewer::TStorageUsage::HDD);