diff --git a/src/containers/Cluster/ClusterInfo/utils/utils.tsx b/src/containers/Cluster/ClusterInfo/utils/utils.tsx
index 5abc43505a..e51934a51d 100644
--- a/src/containers/Cluster/ClusterInfo/utils/utils.tsx
+++ b/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: ,
+ value: (
+
+ ),
});
info.push(...additionalInfo);
diff --git a/src/containers/Clusters/columns.tsx b/src/containers/Clusters/columns.tsx
index 34e7a5b32b..ff089d4851 100644
--- a/src/containers/Clusters/columns.tsx
+++ b/src/containers/Clusters/columns.tsx
@@ -176,13 +176,20 @@ export const CLUSTERS_COLUMNS: Column[] = [
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 ;
+ return (
+
+ );
},
},
{
diff --git a/src/store/reducers/clusters/selectors.ts b/src/store/reducers/clusters/selectors.ts
index d6d42cee77..1f16e08dba 100644
--- a/src/store/reducers/clusters/selectors.ts
+++ b/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;
});
diff --git a/src/types/api/cluster.ts b/src/types/api/cluster.ts
index 3f0b10ee78..21df2c1435 100644
--- a/src/types/api/cluster.ts
+++ b/src/types/api/cluster.ts
@@ -13,6 +13,7 @@ export interface TClusterInfoV1 {
NodesTotal?: number;
NodesAlive?: number;
NumberOfCpus?: number;
+ RealNumberOfCpus?: number;
/** double */
LoadAverage?: number;
/** uint64 */