fix: add RealNumberOfCpus to aggregates (#2095)

Co-authored-by: Anton Standrik <[email protected]>

Author: astandrik

src/containers/Cluster/ClusterInfo/utils/utils.tsx

@@ -63,7 +63,12 @@ export const getInfo = (cluster: TClusterInfo, additionalInfo: InfoItem[]) => {
 
     info.push({
         label: i18n('label_load'),
-        value: <ProgressViewer value={cluster?.LoadAverage} capacity={cluster?.NumberOfCpus} />,
+        value: (
+            <ProgressViewer
+                value={cluster?.LoadAverage}
+                capacity={cluster?.RealNumberOfCpus ?? cluster?.NumberOfCpus}
+            />
+        ),
     });
 
     info.push(...additionalInfo);

src/containers/Clusters/columns.tsx

@@ -176,13 +176,20 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
             return cluster?.NumberOfCpus;
         },
         render: ({row}) => {
-            const {LoadAverage = 0, NumberOfCpus = 0, Overall} = row.cluster || {};
+            const {
+                LoadAverage = 0,
+                NumberOfCpus = 0,
+                RealNumberOfCpus,
+                Overall,
+            } = row.cluster || {};
 
             if (!Overall) {
                 return EMPTY_CELL;
             }
 
-            return <ProgressViewer value={LoadAverage} capacity={NumberOfCpus} />;
+            return (
+                <ProgressViewer value={LoadAverage} capacity={RealNumberOfCpus ?? NumberOfCpus} />
+            );
         },
     },
     {

src/store/reducers/clusters/selectors.ts

@@ -1,5 +1,7 @@
 import escapeRegExp from 'lodash/escapeRegExp';
 
+import {isNumeric} from '../../../utils/utils';
+
 import type {
     ClusterDataAggregation,
     ClustersFilters,
@@ -102,7 +104,10 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
         Object.keys(hosts).forEach((host) => Hosts.add(host));
         Tenants += Number(cluster?.Tenants) || 0;
         LoadAverage += Number(cluster?.LoadAverage) || 0;
-        NumberOfCpus += cluster?.NumberOfCpus || 0;
+        NumberOfCpus += isNumeric(cluster?.RealNumberOfCpus)
+            ? cluster?.RealNumberOfCpus
+            : cluster?.NumberOfCpus || 0;
+
         StorageUsed += cluster?.StorageUsed ? Math.floor(parseInt(cluster.StorageUsed, 10)) : 0;
         StorageTotal += cluster?.StorageTotal ? Math.floor(parseInt(cluster.StorageTotal, 10)) : 0;
     });

src/types/api/cluster.ts

@@ -13,6 +13,7 @@ export interface TClusterInfoV1 {
     NodesTotal?: number;
     NodesAlive?: number;
     NumberOfCpus?: number;
+    RealNumberOfCpus?: number;
     /** double */
     LoadAverage?: number;
     /** uint64 */