fix: fix cpu usage calculation (#542)

Author: krosy1337

src/containers/Tenant/Diagnostics/TenantOverview/MetricsCards/MetricsCards.tsx

@@ -27,7 +27,7 @@ export interface TenantMetrics {
     memoryUsed?: number;
     memoryLimit?: number;
     cpuUsed?: number;
-    cpuLimit?: number;
+    cpuUsage?: number;
     storageUsed?: number;
     storageLimit?: number;
 }
@@ -51,11 +51,10 @@ export function MetricsCards({
 }: MetricsCardsProps) {
     const location = useLocation();
 
-    const {memoryUsed, memoryLimit, cpuUsed, cpuLimit, storageUsed, storageLimit} = metrics || {};
+    const {memoryUsed, memoryLimit, cpuUsed, cpuUsage, storageUsed, storageLimit} = metrics || {};
 
     const {metricsTab} = useTypedSelector((state) => state.tenant);
 
-    const cpuUsage = calculateUsage(cpuUsed, cpuLimit);
     const storageUsage = calculateUsage(storageUsed, storageLimit);
     const memoryUsage = calculateUsage(memoryUsed, memoryLimit);
 

src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx

@@ -70,14 +70,14 @@ export function TenantOverview({tenantName, additionalTenantProps}: TenantOvervi
 
     const tenantType = mapDatabaseTypeToDBName(Type);
 
-    const {cpu, storage, memory, cpuLimit, storageLimit, memoryLimit} =
+    const {cpu, storage, memory, cpuUsage, storageLimit, memoryLimit} =
         calculateTenantMetrics(tenant);
 
     const calculatedMetrics: TenantMetrics = {
         memoryUsed: memory,
         memoryLimit,
         cpuUsed: cpu,
-        cpuLimit,
+        cpuUsage,
         storageUsed: storage,
         storageLimit,
     };

src/store/reducers/tenants/utils.ts

@@ -22,36 +22,30 @@ const getTenantBackend = (tenant: TTenant) => {
 };
 
 export const calculateTenantMetrics = (tenant?: TTenant) => {
-    const {
-        CoresUsed,
-        MemoryUsed,
-        StorageAllocatedSize,
-        CoresLimit,
-        MemoryLimit,
-        StorageLimit,
-        Metrics = {},
-    } = tenant || {};
+    const {CoresUsed, MemoryUsed, StorageAllocatedSize, MemoryLimit, StorageLimit, PoolStats} =
+        tenant || {};
 
-    const cpuFromCores = isNumeric(CoresUsed) ? Number(CoresUsed) * 1_000_000 : undefined;
-    const cpuFromMetrics = isNumeric(Metrics.CPU) ? Number(Metrics.CPU) : undefined;
+    const systemPoolUsage = PoolStats?.find(({Name}) => Name === 'System')?.Usage;
+    const userPoolUsage = PoolStats?.find(({Name}) => Name === 'User')?.Usage;
 
-    const cpu = cpuFromCores ?? cpuFromMetrics ?? undefined;
-
-    const rawMemory = MemoryUsed ?? Metrics.Memory;
-
-    const memory = isNumeric(rawMemory) ? Number(rawMemory) : undefined;
-
-    // Blob storage - actual database size
+    const cpu = isNumeric(CoresUsed) ? Number(CoresUsed) * 1_000_000 : undefined;
+    const memory = isNumeric(MemoryUsed) ? Number(MemoryUsed) : undefined;
     const storage = isNumeric(StorageAllocatedSize) ? Number(StorageAllocatedSize) : undefined;
-    const cpuLimit = isNumeric(CoresLimit) ? Number(CoresLimit) : undefined;
+
+    // We use system pool usage and user pool usage to calculate cpu usage because
+    // only these pools directly indicate resources available to perform user queries
+    const cpuUsage =
+        isNumeric(systemPoolUsage) || isNumeric(userPoolUsage)
+            ? Math.max(Number(systemPoolUsage), Number(userPoolUsage)) * 100
+            : undefined;
     const memoryLimit = isNumeric(MemoryLimit) ? Number(MemoryLimit) : undefined;
     const storageLimit = isNumeric(StorageLimit) ? Number(StorageLimit) : undefined;
 
     return {
         cpu,
         memory,
         storage,
-        cpuLimit,
+        cpuUsage,
         memoryLimit,
         storageLimit,
     };

src/types/api/tenant.ts

@@ -42,23 +42,22 @@ export interface TTenant {
     ResourceId?: string;
     Tablets?: TTabletStateInfo[];
     /** uint64 */
-    StorageAllocatedSize?: string;
+    StorageAllocatedSize?: string; // Actual database size
     /** uint64 */
     StorageMinAvailableSize?: string;
     Nodes?: TSystemStateInfo[];
     /** uint64 */
-    MemoryUsed?: string;
+    MemoryUsed?: string; // Actual memory consumption
     /** uint64 */
     MemoryLimit?: string;
     /** double */
-    CoresUsed?: number;
+    CoresUsed?: number; // Actual cpu consumption
     /** uint64 */
     StorageGroups?: string;
 
     MonitoringEndpoint?: string; // additional
     ControlPlane?: ControlPlane; // additional
 
-    CoresLimit?: string; // TODO: check correctness in backend protos when fully supported
     StorageLimit?: string; // TODO: check correctness in backend protos when fully supported
 }
 
@@ -69,15 +68,15 @@ interface THiveDomainStatsStateCount {
 
 export interface TMetrics {
     /** uint64 */
-    CPU?: string;
+    CPU?: string; // Logical cpu consumption
     /** uint64 */
-    Memory?: string;
+    Memory?: string; // Logical memory consumption
     /** uint64 */
     Network?: string;
     /** uint64 */
     Counter?: string;
     /** uint64 */
-    Storage?: string;
+    Storage?: string; // Logical database size
     /** uint64 */
     ReadThroughput?: string;
     /** uint64 */