Merge be72fed into 2d68e78

Author: StekPerepolnen

ydb/core/viewer/json_tenantinfo.h

@@ -56,6 +56,11 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
     TString RootId; // id of root domain (tenant)
     NKikimrViewer::TTenantInfo Result;
 
+    struct TStorageQuota {
+        uint64 SoftQuota = 0;
+        uint64 HardQuota = 0;
+    };
+
 public:
     static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
         return NKikimrServices::TActivity::VIEWER_HANDLER;
@@ -478,6 +483,17 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
         }
     }
 
+    NKikimrViewer::TStorageUsage::EType GetStorageType(const TString& poolKind) {
+        auto kind = to_lower(poolKind);
+        if (kind.StartsWith("ssd") || kind.StartsWith("nvme")) {
+            return NKikimrViewer::TStorageUsage::SSD;
+        }
+        if (kind.StartsWith("hdd") || kind.StartsWith("rot")) {
+            return NKikimrViewer::TStorageUsage::HDD;
+        }
+        return NKikimrViewer::TStorageUsage::None;
+    }
+
     void ReplyAndPassAway() {
         BLOG_TRACE("ReplyAndPassAway() started");
         TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
@@ -632,22 +648,33 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
                         tenant.SetStorageAllocatedLimit(storageAllocatedLimit);
                         tenant.SetStorageMinAvailableSize(storageMinAvailableSize);
                         tenant.SetStorageGroups(storageGroups);
+                    }
+
+                    THashMap<NKikimrViewer::TStorageUsage::EType, ui64> storageUsageByType;
+                    THashMap<NKikimrViewer::TStorageUsage::EType, TStorageQuota> storageQuotasByType;
+                    if (entry.DomainDescription) {
+                        for (const auto& poolUsage : entry.DomainDescription->Description.GetDiskSpaceUsage().GetStoragePoolsUsage()) {
+                            auto type = GetStorageType(poolUsage.GetPoolKind());
+                            storageUsageByType[type] += poolUsage.GetTotalSize();
+                        }
+                    }
+
+                    for (const auto& quota : tenant.GetDatabaseQuotas().storage_quotas()) {
+                        auto type = GetStorageType(quota.unit_kind());
+                        auto& usage = storageQuotasByType[type];
+                        usage.SoftQuota += quota.data_size_soft_quota();
+                        usage.HardQuota += quota.data_size_hard_quota();
+                    }
 
-                        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);
+                    for (const auto& [type, size] : storageUsageByType) {
+                        auto& storageUsage = *tenant.AddStorageUsage();
+                        storageUsage.SetType(type);
+                        storageUsage.SetSize(size);
+                        auto it = storageQuotasByType.find(type);
+                        if (it != storageQuotasByType.end()) {
+                            storageUsage.SetLimit(it->second.HardQuota);
+                            storageUsage.SetSoftQuota(it->second.SoftQuota);
+                            storageUsage.SetHardQuota(it->second.HardQuota);
                         }
                     }
                 }

ydb/core/viewer/protos/viewer.proto

@@ -345,6 +345,8 @@ message TStorageUsage {
     EType Type = 1;
     uint64 Size = 2;
     uint64 Limit = 3;
+    uint64 SoftQuota = 4;
+    uint64 HardQuota = 5;
 }
 
 message TTenant {
@@ -376,7 +378,6 @@ message TTenant {
     uint64 StorageAllocatedLimit = 41;
     Ydb.Cms.DatabaseQuotas DatabaseQuotas = 42;
     repeated TStorageUsage StorageUsage = 43;
-    repeated TStorageUsage QuotaUsage = 44;
 }
 
 message TTenants {