Merge pull request #4248 from rawagner/bmh_util_align

Bug 1800588: Align BMH dashboard utilization item with other dashboards
openshift · Feb 7, 2020 · 2a76e9e · 2a76e9e
2 parents d797be9 + 612429d
commit 2a76e9e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/frontend/packages/metal3-plugin/src/components/baremetal-hosts/dashboard/UtilizationCard.tsx b/frontend/packages/metal3-plugin/src/components/baremetal-hosts/dashboard/UtilizationCard.tsx
@@ -136,15 +136,15 @@ const UtilizationCard: React.FC = () => {
       </DashboardCardHeader>
       <UtilizationBody timestamps={timestamps}>
         <PrometheusUtilizationItem
-          title="CPU usage"
+          title="CPU"
           utilizationQuery={queries[HostQuery.CPU_UTILIZATION].utilization}
           humanizeValue={humanizeCpuCores}
           TopConsumerPopover={cpuPopover}
           duration={duration}
           setTimestamps={setTimestamps}
         />
         <PrometheusUtilizationItem
-          title="Memory usage"
+          title="Memory"
           utilizationQuery={queries[HostQuery.MEMORY_UTILIZATION].utilization}
           totalQuery={queries[HostQuery.MEMORY_UTILIZATION].total}
           humanizeValue={humanizeBinaryBytes}
@@ -153,9 +153,12 @@ const UtilizationCard: React.FC = () => {
           duration={duration}
         />
         <PrometheusUtilizationItem
-          title="Number of pods"
-          utilizationQuery={queries[HostQuery.NUMBER_OF_PODS].utilization}
-          humanizeValue={humanizePods}
+          title="Filesystem"
+          utilizationQuery={queries[HostQuery.STORAGE_UTILIZATION].utilization}
+          totalQuery={queries[HostQuery.STORAGE_UTILIZATION].total}
+          humanizeValue={humanizeBinaryBytes}
+          byteDataType={ByteDataTypes.BinaryBytes}
+          TopConsumerPopover={storagePopover}
           duration={duration}
         />
         <PrometheusMultilineUtilizationItem
@@ -165,12 +168,9 @@ const UtilizationCard: React.FC = () => {
           duration={duration}
         />
         <PrometheusUtilizationItem
-          title="Filesystem"
-          utilizationQuery={queries[HostQuery.STORAGE_UTILIZATION].utilization}
-          totalQuery={queries[HostQuery.STORAGE_UTILIZATION].total}
-          humanizeValue={humanizeBinaryBytes}
-          byteDataType={ByteDataTypes.BinaryBytes}
-          TopConsumerPopover={storagePopover}
+          title="Pod count"
+          utilizationQuery={queries[HostQuery.NUMBER_OF_PODS].utilization}
+          humanizeValue={humanizePods}
           duration={duration}
         />
       </UtilizationBody>