Merge pull request #6816 from spadgett/node-cores

Bug 1852743: Show total cores in node list
openshift · Oct 6, 2020 · ec399f2 · ec399f2
2 parents 6d58f8f + bf365a1
commit ec399f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/frontend/packages/console-app/src/components/nodes/NodesPage.tsx b/frontend/packages/console-app/src/components/nodes/NodesPage.tsx
@@ -242,6 +242,11 @@ const NodesTableRow = connect<NodesRowMapFromStateProps, null, NodesTableRowProp
         ? `${humanizeBinaryBytes(usedMem).string} / ${humanizeBinaryBytes(totalMem).string}`
         : '-';
     const cores = metrics?.cpu?.[nodeName];
+    const totalCores = metrics?.totalCPU?.[nodeName];
+    const cpu =
+      Number.isFinite(cores) && Number.isFinite(totalCores)
+        ? `${formatCores(cores)} / ${totalCores} cores`
+        : '-';
     const usedStrg = metrics?.usedStorage?.[nodeName];
     const totalStrg = metrics?.totalStorage?.[nodeName];
     const storage =
@@ -292,7 +297,7 @@ const NodesTableRow = connect<NodesRowMapFromStateProps, null, NodesTableRowProp
           columns={columns}
           columnID={nodeColumnInfo.cpu.id}
         >
-          {cores ? `${formatCores(cores)} cores` : '-'}
+          {cpu}
         </TableData>
         <TableData
           className={nodeColumnInfo.filesystem.classes}
@@ -443,6 +448,10 @@ const fetchNodeMetrics = (): Promise<NodeMetrics> => {
       key: 'cpu',
       query: 'sum by(instance) (instance:node_cpu:rate:sum)',
     },
+    {
+      key: 'totalCPU',
+      query: 'sum by(instance) (instance:node_num_cpu:sum)',
+    },
     {
       key: 'pods',
       query: 'sum by(node)(kubelet_running_pods)',

diff --git a/frontend/public/actions/ui.ts b/frontend/public/actions/ui.ts
@@ -91,6 +91,7 @@ export type PodMetrics = {
 
 export type NodeMetrics = {
   cpu: MetricValuesByName;
+  totalCPU: MetricValuesByName;
   pods: MetricValuesByName;
   usedMemory: MetricValuesByName;
   totalMemory: MetricValuesByName;