nodes-added-pdiskid-filter

ydb-platform · Apr 10, 2024 · 94ed60c · 94ed60c
1 parent 77c6779
commit 94ed60c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h
@@ -628,13 +628,23 @@ 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);
                         // TODO(andrew-rykov)
                         auto& hddUsage = *tenant.AddStorageUsage();
                         hddUsage.SetType(NKikimrViewer::TStorageUsage::HDD);
+
+                        if (tenant.databasequotas().data_size_hard_quota()) {
+                            auto& ssdQuotaUsage = *tenant.AddQuotaUsage();
+                            ssdQuotaUsage.SetType(NKikimrViewer::TStorageUsage::SSD);
+                            ssdQuotaUsage.SetSize(tenant.GetMetrics().GetStorage());
+                            ssdQuotaUsage.SetLimit(tenant.databasequotas().data_size_hard_quota());
+                            auto& hddQuotaUsage = *tenant.AddQuotaUsage();
+                            hddQuotaUsage.SetType(NKikimrViewer::TStorageUsage::HDD);
+                        }
                     }
                 }
 

diff --git a/ydb/core/viewer/protos/viewer.proto b/ydb/core/viewer/protos/viewer.proto
@@ -375,6 +375,7 @@ message TTenant {
     uint64 StorageAllocatedLimit = 41;
     Ydb.Cms.DatabaseQuotas DatabaseQuotas = 42;
     repeated TStorageUsage StorageUsage = 43;
+    repeated TStorageUsage QuotaUsage = 44;
 }
 
 message TTenants {