Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/containers/Cluster/ClusterInfo/utils/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 9 additions & 2 deletions src/containers/Clusters/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
);
},
},
{
Expand Down
7 changes: 6 additions & 1 deletion src/store/reducers/clusters/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import escapeRegExp from 'lodash/escapeRegExp';

import {isNumeric} from '../../../utils/utils';

import type {
ClusterDataAggregation,
ClustersFilters,
Expand Down Expand Up @@ -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;
});
Expand Down
1 change: 1 addition & 0 deletions src/types/api/cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface TClusterInfoV1 {
NodesTotal?: number;
NodesAlive?: number;
NumberOfCpus?: number;
RealNumberOfCpus?: number;
/** double */
LoadAverage?: number;
/** uint64 */
Expand Down
Loading