Merge branches 'w/2.9/bugfix/cpu-system-load-over-100' and 'q/3197/2.…

…8/bugfix/cpu-system-load-over-100' into tmp/octopus/q/2.9
scality · Mar 15, 2021 · e04980f · e04980f
3 parents cd73442 + f5f33fd + cb970cf
commit e04980f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/ui/src/components/LinechartSpec.js b/ui/src/components/LinechartSpec.js
@@ -8,14 +8,6 @@ export const yAxisUsage = [
     scale: { domain: [0, 100] },
   },
 ];
-// Remove the scale for the chart loading state
-export const yAxisUsageLoading = [
-  {
-    field: 'y',
-    type: 'quantitative',
-    axis: { title: null, orient: 'right' },
-  },
-];
 
 export const yAxis = [
   {

diff --git a/ui/src/containers/NodePageMetricsTab.js b/ui/src/containers/NodePageMetricsTab.js
@@ -12,7 +12,6 @@ import {
 import {
   yAxisUsage,
   yAxis,
-  yAxisUsageLoading,
   getTooltipConfig,
 } from '../components/LinechartSpec';
 import {
@@ -561,7 +560,7 @@ const NodePageMetricsTab = ({
               id={'node_cpu_usage_id'}
               data={cpuData.length ? cpuData : []}
               xAxis={xAxis}
-              yAxis={cpuData.length ? yAxisUsage : yAxisUsageLoading}
+              yAxis={cpuData.length ? yAxisUsage : yAxis}
               color={colorCPU}
               width={graphWidth}
               height={graphHeight}
@@ -584,7 +583,7 @@ const NodePageMetricsTab = ({
               id={'node_system_load_id'}
               data={systemLoadData ? systemLoadData : []}
               xAxis={xAxis}
-              yAxis={cpuData.length ? yAxisUsage : yAxisUsageLoading}
+              yAxis={yAxis}
               color={colorSystemLoad}
               width={graphWidth}
               height={graphHeight}
@@ -608,7 +607,7 @@ const NodePageMetricsTab = ({
               id={'node_memory_id'}
               data={memoryData.length ? memoryData : []}
               xAxis={xAxis}
-              yAxis={cpuData.length ? yAxisUsage : yAxisUsageLoading}
+              yAxis={memoryData.length ? yAxisUsage : yAxis}
               color={colorMemory}
               width={graphWidth}
               height={graphHeight}