CONSOLE-4945: Add Disk, Network, CPU and VM counts to node overview

frontend/packages/console-app/locales/en/console-app.json

@@ -354,15 +354,23 @@
   "Mark unschedulable": "Mark unschedulable",
   "View events": "View events",
   "Activity": "Activity",
+  "Disk": "Disk",
+  "Network": "Network",
+  "NIC": "NIC",
+  "CPU": "CPU",
   "Details": "Details",
   "Node name": "Node name",
   "Instance type": "Instance type",
   "Not available": "Not available",
   "Node addresses": "Node addresses",
   "Uptime": "Uptime",
   "Inventory": "Inventory",
-  "Image": "Image",
   "Images": "Images",
+  "Image": "Image",
+  "Virtual machines (CNV)": "Virtual machines (CNV)",
+  "This count is based on your access permissions and might not include all virtual machines.": "This count is based on your access permissions and might not include all virtual machines.",
+  "Virtual machine": "Virtual machine",
+  "Virtual machines": "Virtual machines",
   "Health checks": "Health checks",
   "See details": "See details",
   "{{ cpuMessage }}": "{{ cpuMessage }}",
@@ -374,7 +382,6 @@
   "Only one {{ machineHealthCheckLabel }} resource should match this node.": "Only one {{ machineHealthCheckLabel }} resource should match this node.",
   "Not configured": "Not configured",
   "No conditions": "No conditions",
-  "CPU": "CPU",
   "Memory": "Memory",
   "Network in": "Network in",
   "Network out": "Network out",
@@ -407,8 +414,6 @@
   "Kubelet version": "Kubelet version",
   "Kube-Proxy version": "Kube-Proxy version",
   "Machine set": "Machine set",
-  "Virtual machines": "Virtual machines",
-  "This count is based on your access permissions and might not include all virtual machines.": "This count is based on your access permissions and might not include all virtual machines.",
   "MachineConfigPool": "MachineConfigPool",
   "{{formattedCores}} cores / {{totalCores}} cores": "{{formattedCores}} cores / {{totalCores}} cores",
   "Node": "Node",

frontend/packages/console-app/src/components/nodes/NodeBareMetalUtils.ts

@@ -0,0 +1,57 @@
+import {
+  K8sGroupVersionKind,
+  K8sResourceKind,
+  WatchK8sResult,
+} from '@console/dynamic-plugin-sdk/src';
+import { useFlag } from '@console/dynamic-plugin-sdk/src/utils/flags';
+import { useK8sWatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks';
+import { K8sKind } from '@console/internal/module/k8s';
+
+export const BAREMETAL_FLAG = 'BAREMETAL';
+
+export const BareMetalHostModel: K8sKind = {
+  label: 'Bare Metal Host',
+  labelPlural: 'Bare Metal Hosts',
+  apiVersion: 'v1alpha1',
+  apiGroup: 'metal3.io',
+  plural: 'baremetalhosts',
+  abbr: 'BMH',
+  namespaced: true,
+  kind: 'BareMetalHost',
+  id: 'baremetalhost',
+  crd: true,
+};
+
+export const BareMetalHostGroupVersionKind: K8sGroupVersionKind = {
+  group: 'metal3.io',
+  kind: 'BareMetalHost',
+  version: 'v1alpha1',
+};
+
+export const useIsBareMetalPluginActive = () => useFlag(BAREMETAL_FLAG);
+
+export const useWatchBareMetalHost = (nodeName: string): WatchK8sResult<K8sResourceKind> => {
+  const isBareMetalPluginActive = useIsBareMetalPluginActive();
+
+  const [bareMetalHosts, bareMetalHostsLoaded, bareMetalHostsLoadError] = useK8sWatchResource<
+    K8sResourceKind[]
+  >(
+    isBareMetalPluginActive
+      ? {
+          isList: true,
+          groupVersionKind: BareMetalHostGroupVersionKind,
+          fieldSelector: `metadata.name=${nodeName}`,
+        }
+      : undefined,
+  );
+
+  return [bareMetalHosts?.[0], bareMetalHostsLoaded, bareMetalHostsLoadError];
+};
+
+export const metricsFromBareMetalHosts = (
+  bareMetalHost?: K8sResourceKind,
+): { disks?: number; nics?: number; cpus?: number } => ({
+  disks: bareMetalHost?.status?.hardware?.storage?.length,
+  nics: bareMetalHost?.status?.hardware?.nics?.length,
+  cpus: bareMetalHost?.status?.hardware?.cpu?.count,
+});

frontend/packages/console-app/src/components/nodes/NodeVmUtils.ts

@@ -0,0 +1,68 @@
+import {
+  K8sGroupVersionKind,
+  K8sResourceKind,
+  WatchK8sResult,
+} from '@console/dynamic-plugin-sdk/src';
+import { useFlag } from '@console/dynamic-plugin-sdk/src/utils/flags';
+import { useK8sWatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks';
+import { K8sKind } from '@console/internal/module/k8s';
+
+export const VirtualMachineModel: K8sKind = {
+  label: 'VirtualMachine',
+  labelPlural: 'VirtualMachines',
+  apiVersion: 'v1',
+  apiGroup: 'kubevirt.io',
+  plural: 'virtualmachines',
+  abbr: 'VM',
+  namespaced: true,
+  kind: 'VirtualMachine',
+  id: 'virtualmachine',
+  crd: true,
+};
+
+// TODO: Remove VMI retrieval and VMs count column if/when the plugin is able to add the VMs count column
+export const VirtualMachineInstanceGroupVersionKind: K8sGroupVersionKind = {
+  group: 'kubevirt.io',
+  kind: 'VirtualMachineInstance',
+  version: 'v1',
+};
+
+export const useIsKubevirtPluginActive = () => {
+  const kubevirtFeature = useFlag('KUBEVIRT_DYNAMIC');
+
+  return (
+    Array.isArray(window.SERVER_FLAGS?.consolePlugins) &&
+    window.SERVER_FLAGS.consolePlugins.includes('kubevirt-plugin') &&
+    kubevirtFeature
+  );
+};
+
+// Return all matching VMIs, if no nodeName is given, return all VMIs.
+export const filterVirtualMachineInstancesByNode = (vmis: K8sResourceKind[], nodeName?: string) =>
+  vmis?.filter((vm) => !nodeName || vm.status?.nodeName === nodeName) ?? [];
+
+// Watch VMIs and return all matching VMIs by nodeName if given, if not, return all VMIs.
+export const useWatchVirtualMachineInstances = (
+  nodeName?: string,
+): WatchK8sResult<K8sResourceKind[]> => {
+  const isKubevirtPluginActive = useIsKubevirtPluginActive();
+
+  const [
+    virtualMachineInstances,
+    virtualMachineInstancesLoaded,
+    virtualMachineInstancesLoadError,
+  ] = useK8sWatchResource<K8sResourceKind[]>(
+    isKubevirtPluginActive
+      ? {
+          isList: true,
+          groupVersionKind: VirtualMachineInstanceGroupVersionKind,
+        }
+      : undefined,
+  );
+
+  return [
+    filterVirtualMachineInstancesByNode(virtualMachineInstances, nodeName),
+    virtualMachineInstancesLoaded,
+    virtualMachineInstancesLoadError,
+  ];
+};

frontend/packages/console-app/src/components/nodes/NodesPage.tsx

@@ -17,17 +17,19 @@ import {
   ConsoleDataViewRow,
   ResourceFilters,
 } from '@console/app/src/components/data-view/types';
+import {
+  filterVirtualMachineInstancesByNode,
+  useIsKubevirtPluginActive,
+  useWatchVirtualMachineInstances,
+} from '@console/app/src/components/nodes/NodeVmUtils';
 import {
   getGroupVersionKindForResource,
   K8sModel,
   ListPageBody,
   useAccessReview,
-  useFlag,
 } from '@console/dynamic-plugin-sdk/src/api/dynamic-core-api';
 import {
-  K8sGroupVersionKind,
   K8sResourceCommon,
-  K8sResourceKind,
   NodeCertificateSigningRequestKind,
   OwnerReference,
   RowProps,
@@ -101,13 +103,6 @@ import { NodeStatusWithExtensions } from './NodeStatus';
 import ClientCSRStatus from './status/CSRStatus';
 import { GetNodeStatusExtensions, useNodeStatusExtensions } from './useNodeStatusExtensions';
 
-// TODO: Remove VMI retrieval and VMs count column if/when the plugin is able to add the VMs count column
-const VirtualMachineInstanceGroupVersionKind: K8sGroupVersionKind = {
-  group: 'kubevirt.io',
-  kind: 'VirtualMachineInstance',
-  version: 'v1',
-};
-
 const nodeColumnInfo = Object.freeze({
   name: {
     id: 'name',
@@ -902,40 +897,22 @@ export const NodesPage: FC<NodesPageProps> = ({ selector }) => {
     CertificateSigningRequestKind[]
   >(CertificateSigningRequestModel);
 
-  const kubevirtFeature = useFlag('KUBEVIRT_DYNAMIC');
-  const isKubevirtPluginActive =
-    Array.isArray(window.SERVER_FLAGS.consolePlugins) &&
-    window.SERVER_FLAGS.consolePlugins.includes('kubevirt-plugin') &&
-    kubevirtFeature;
+  // TODO: Remove VMs count column if/when the plugin is able to add the VMs count column
+  const isKubevirtPluginActive = useIsKubevirtPluginActive();
 
-  const [vmis, vmisLoaded, vmisLoadError] = useK8sWatchResource<K8sResourceKind[]>(
-    isKubevirtPluginActive
-      ? {
-          isList: true,
-          groupVersionKind: VirtualMachineInstanceGroupVersionKind,
-        }
-      : undefined,
-  );
+  const [vmis, vmisLoaded, vmisLoadError] = useWatchVirtualMachineInstances();
 
   const vmsByNode = useMemo(() => {
     if (!isKubevirtPluginActive || !nodesLoaded || nodesLoadError || !vmisLoaded || vmisLoadError) {
       return undefined;
     }
 
-    const map = new Map<string, K8sResourceKind[]>(nodes.map((node) => [node.metadata.name, []]));
-    vmis.forEach((vmi) => {
-      const nodeName = vmi.status?.nodeName;
-      if (!nodeName) {
-        return;
-      }
-      const nodeVMs = map.get(nodeName);
-      if (nodeVMs) {
-        nodeVMs.push(vmi);
-      } else {
-        map.set(nodeName, [vmi]);
-      }
-    });
-    return map;
+    return new Map(
+      nodes.map((node) => [
+        `${node.metadata.name}`,
+        filterVirtualMachineInstancesByNode(vmis, node.metadata.name),
+      ]),
+    );
   }, [isKubevirtPluginActive, nodes, nodesLoadError, nodesLoaded, vmis, vmisLoadError, vmisLoaded]);
 
   useEffect(() => {

frontend/packages/console-app/src/components/nodes/node-dashboard/BareMetalInventoryItems.tsx

@@ -0,0 +1,117 @@
+import type { FC } from 'react';
+import { useContext } from 'react';
+import {
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+} from '@patternfly/react-core';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom-v5-compat';
+import {
+  BareMetalHostModel,
+  metricsFromBareMetalHosts,
+  useIsBareMetalPluginActive,
+  useWatchBareMetalHost,
+} from '@console/app/src/components/nodes/NodeBareMetalUtils';
+import { resourcePathFromModel } from '@console/internal/components/utils/resource-link';
+import { DASH } from '@console/shared/src';
+import { InventoryItem } from '@console/shared/src/components/dashboard/inventory-card/InventoryItem';
+import { NodeDashboardContext } from './NodeDashboardContext';
+
+type BareMetalInventoryItemsProps = {
+  loaded: boolean;
+  loadError?: unknown;
+  title: string;
+  itemsTitle?: string;
+  count: number | undefined;
+  linkTo?: string;
+};
+
+const BareMetalInventoryItem: FC<BareMetalInventoryItemsProps> = ({
+  loaded,
+  loadError,
+  title,
+  itemsTitle,
+  count,
+  linkTo,
+}) => {
+  return (
+    <DescriptionListGroup>
+      <DescriptionListTerm>{title}</DescriptionListTerm>
+      <DescriptionListDescription>
+        {!loaded ? (
+          <InventoryItem title={title} isLoading count={0} />
+        ) : loadError || count === undefined ? (
+          DASH
+        ) : linkTo ? (
+          <Link to={linkTo}>
+            <InventoryItem title={itemsTitle ?? title} isLoading={false} count={count} />
+          </Link>
+        ) : (
+          <InventoryItem title={itemsTitle ?? title} isLoading={false} count={count} />
+        )}
+      </DescriptionListDescription>
+    </DescriptionListGroup>
+  );
+};
+
+const BareMetalInventoryItems: FC = () => {
+  const { obj } = useContext(NodeDashboardContext);
+  const { t } = useTranslation();
+
+  const showBareMetal = useIsBareMetalPluginActive();
+
+  const [bareMetalHost, bareMetalHostLoaded, bareMetalHostLoadError] = useWatchBareMetalHost(
+    obj.metadata.name,
+  );
+
+  if (!showBareMetal) {
+    return null;
+  }
+
+  const { disks, nics, cpus } = metricsFromBareMetalHosts(bareMetalHost);
+
+  return (
+    <>
+      <BareMetalInventoryItem
+        loaded={bareMetalHostLoaded}
+        loadError={bareMetalHostLoadError || !bareMetalHost}
+        title={t('console-app~Disk')}
+        count={disks}
+        linkTo={
+          bareMetalHost
+            ? `${resourcePathFromModel(
+                BareMetalHostModel,
+                bareMetalHost.metadata.name,
+                bareMetalHost.metadata.namespace,
+              )}/disks`
+            : undefined
+        }
+      />
+      <BareMetalInventoryItem
+        loaded={bareMetalHostLoaded}
+        loadError={bareMetalHostLoadError || !bareMetalHost}
+        title={t('console-app~Network')}
+        itemsTitle={t('console-app~NIC')}
+        count={nics}
+        linkTo={
+          bareMetalHost
+            ? `${resourcePathFromModel(
+                BareMetalHostModel,
+                bareMetalHost.metadata.name,
+                bareMetalHost.metadata.namespace,
+              )}/nics`
+            : undefined
+        }
+      />
+      <BareMetalInventoryItem
+        loaded={bareMetalHostLoaded}
+        loadError={bareMetalHostLoadError || !bareMetalHost}
+        title={t('console-app~CPU')}
+        count={cpus}
+      />
+    </>
+  );
+};
+
+export default BareMetalInventoryItems;