feat: add support for RealNumberOfCpus for load average

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/ClustersStatistics.tsx

@@ -18,6 +18,7 @@ export const ClustersStatistics = ({count, stats}: ClustersStatisticsProps) => {
         Tenants,
         LoadAverage,
         NumberOfCpus,
+        RealNumberOfCpus,
         StorageUsed,
         StorageTotal,
     } = stats;
@@ -51,7 +52,7 @@ export const ClustersStatistics = ({count, stats}: ClustersStatisticsProps) => {
                 <ProgressViewer
                     size="ns"
                     value={LoadAverage}
-                    capacity={NumberOfCpus}
+                    capacity={RealNumberOfCpus || NumberOfCpus}
                     colorizeProgress={true}
                 />
             </div>

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

@@ -89,6 +89,7 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
         NodesAlive = 0,
         LoadAverage = 0,
         NumberOfCpus = 0,
+        RealNumberOfCpus = 0,
         StorageUsed = 0,
         StorageTotal = 0,
         Tenants = 0;
@@ -103,6 +104,7 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
         Tenants += Number(cluster?.Tenants) || 0;
         LoadAverage += Number(cluster?.LoadAverage) || 0;
         NumberOfCpus += cluster?.NumberOfCpus || 0;
+        RealNumberOfCpus += cluster?.RealNumberOfCpus || 0;
         StorageUsed += cluster?.StorageUsed ? Math.floor(parseInt(cluster.StorageUsed, 10)) : 0;
         StorageTotal += cluster?.StorageTotal ? Math.floor(parseInt(cluster.StorageTotal, 10)) : 0;
     });
@@ -114,6 +116,7 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
         Tenants,
         LoadAverage,
         NumberOfCpus,
+        RealNumberOfCpus,
         StorageUsed,
         StorageTotal,
     };

src/store/reducers/clusters/types.ts

@@ -12,6 +12,7 @@ export interface ClusterDataAggregation {
     Tenants: number;
     LoadAverage: number;
     NumberOfCpus: number;
+    RealNumberOfCpus?: number;
     StorageUsed: number;
     StorageTotal: number;
 }

src/types/api/cluster.ts

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

src/types/api/nodes.ts

@@ -105,6 +105,7 @@ export interface TSystemStateInfo {
     /** double */
     LoadAverage?: number[];
     NumberOfCpus?: number;
+    RealNumberOfCpus?: number;
     SystemState?: EFlag;
     MessageBusState?: EFlag;
     GRpcState?: EFlag;

src/utils/nodes.ts

@@ -44,14 +44,15 @@ export const prepareNodesMap = (nodesList?: TNodeInfo[]) => {
 };
 
 export function calculateLoadAveragePercents(node: TSystemStateInfo = {}) {
-    const {LoadAverage, NumberOfCpus} = node;
+    const {LoadAverage, NumberOfCpus, RealNumberOfCpus} = node;
+    const cpuCount = RealNumberOfCpus || NumberOfCpus;
 
-    if (!valueIsDefined(LoadAverage) || !valueIsDefined(NumberOfCpus)) {
+    if (!valueIsDefined(LoadAverage) || !valueIsDefined(cpuCount)) {
         return undefined;
     }
 
     return LoadAverage.map((value) => {
-        return (value * 100) / NumberOfCpus;
+        return (value * 100) / cpuCount;
     });
 }