Merge pull request #1257 from avivtur/no_data_overview_graphs

Bug 2183915: "No data available" shows on Virtualization overview metrics chart
kubevirt-ui · Apr 18, 2023 · ed3dfcf · ed3dfcf
2 parents 5ea423e + 8ff6358
commit ed3dfcf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/locales/en/plugin__kubevirt-plugin.json b/locales/en/plugin__kubevirt-plugin.json
@@ -1131,6 +1131,7 @@
   "VM": "VM",
   "VMI": "VMI",
   "VMs": "VMs",
+  "VMs in this namespace are new, therefore not enough data is collected to display a graph.": "VMs in this namespace are new, therefore not enough data is collected to display a graph.",
   "VNC Address": "VNC Address",
   "VNC console": "VNC console",
   "VNC Port": "VNC Port",

diff --git a/src/views/clusteroverview/OverviewTab/metric-charts-card/components/ChartCard.tsx b/src/views/clusteroverview/OverviewTab/metric-charts-card/components/ChartCard.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import MutedTextSpan from '@kubevirt-utils/components/MutedTextSpan/MutedTextSpan';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
+import { isEmpty } from '@kubevirt-utils/utils/utils';
 import { Bullseye, Card, Grid, GridItem } from '@patternfly/react-core';
 
 import useMetricChartData from '../utils/hooks/useMetricChartData';
@@ -40,7 +41,15 @@ const ChartCard: React.FC<ChartCardProps> = ({ metric }) => {
             </span>
           ) : (
             <Bullseye>
-              <MutedTextSpan text={t('No data available')} />
+              <MutedTextSpan
+                text={
+                  isEmpty(chartData)
+                    ? t('No data available')
+                    : t(
+                        'VMs in this namespace are new, therefore not enough data is collected to display a graph.',
+                      )
+                }
+              />
             </Bullseye>
           )}
         </GridItem>

diff --git a/src/views/clusteroverview/OverviewTab/metric-charts-card/utils/metricQueries.ts b/src/views/clusteroverview/OverviewTab/metric-charts-card/utils/metricQueries.ts
@@ -8,8 +8,9 @@ const metricQueriesForNamespace = {
   [METRICS.VCPU_USAGE]: (namespace) =>
     `count(kubevirt_vmi_vcpu_wait_seconds{namespace="${namespace}"})`,
   [METRICS.MEMORY]: (namespace) =>
-    `sum(kubevirt_vmi_memory_available_bytes - kubevirt_vmi_memory_usable_bytes) by (${namespace})`,
-  [METRICS.STORAGE]: (namespace) => `sum(kubevirt_vmi_filesystem_used_bytes) by (${namespace})`,
+    `sum by (namespace)(kubevirt_vmi_memory_available_bytes{namespace="${namespace}"} - kubevirt_vmi_memory_usable_bytes{namespace="${namespace}"})`,
+  [METRICS.STORAGE]: (namespace) =>
+    `sum by (namespace)(kubevirt_vmi_filesystem_used_bytes{namespace="${namespace}"})`,
 };
 
 const metricQueriesForAllNamespaces = {