Merge pull request ManageIQ#7185 from himdel/container-project-dashboard

Container project dashboard - add missing dataAvailable
NickLaMuro · Jul 8, 2020 · b21c7d9 · b21c7d9
2 parents 0401439 + 030d7c1
commit b21c7d9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/services/container_service_mixin.rb b/app/services/container_service_mixin.rb
@@ -50,6 +50,7 @@ def hourly_pod_metrics
   def create_delete_data(create_trend, delete_trend)
     if create_trend.any?
       {
+        :dataAvailable => true,
         :xData    => create_trend.keys,
         :yCreated => create_trend.values.map(&:round),
         :yDeleted => delete_trend.values.map(&:round)
@@ -71,6 +72,7 @@ def utilization_data(used_cpu, total_cpu, used_mem, total_mem)
   def trend_data(trend)
     if trend.any?
       {
+        :dataAvailable => true,
         :xData => trend.keys,
         :yData => trend.values.map { |value| (value || 0).round }
       }
@@ -154,6 +156,7 @@ def realtime_utilization
 
     if used_cpu.any?
       {
+        :dataAvailable => true,
         :interval_name => "realtime",
         :xy_data       => utilization_data(used_cpu, total_cpu, used_mem, total_mem)
       }
@@ -173,6 +176,7 @@ def hourly_utilization
 
     if used_cpu.any?
       {
+        :dataAvailable => true,
         :interval_name => "hourly",
         :xy_data       => utilization_data(used_cpu, total_cpu, used_mem, total_mem)
       }
@@ -192,6 +196,7 @@ def daily_utilization
 
     if used_cpu.any?
       {
+        :dataAvailable => true,
         :interval_name => "daily",
         :xy_data       => utilization_data(used_cpu, total_cpu, used_mem, total_mem)
       }

diff --git a/app/services/dashboard_service.rb b/app/services/dashboard_service.rb
@@ -16,6 +16,7 @@ def format_utilization_data(used_cpu, used_mem, total_cpu, total_mem)
 
   def format_cpu(used, total)
     {
+      :dataAvailable => true,
       :used  => cpu_num(used.values.last).round(display_precision),
       :total => cpu_num(total.values.last).round(0),
       :xData => used.keys,
@@ -29,6 +30,7 @@ def cpu_num(val)
 
   def format_memory(used, total)
     {
+      :dataAvailable => true,
       :used  => mem_num(used.values.last).round(display_precision),
       :total => mem_num(total.values.last).round(0),
       :xData => used.keys,

diff --git a/spec/services/container_dashboard_service_spec.rb b/spec/services/container_dashboard_service_spec.rb
@@ -77,12 +77,14 @@
 
       expect(node_utilization_single_provider).to eq(
         :cpu    => {
+          :dataAvailable => true,
           :used  => 2,
           :total => 2,
           :xData => [current_date],
           :yData => [2]
         },
         :memory => {
+          :dataAvailable => true,
           :used  => 1,
           :total => 2,
           :xData => [current_date],
@@ -92,12 +94,14 @@
 
       expect(node_utilization_all_providers).to eq(
         :cpu    => {
+          :dataAvailable => true,
           :used  => 3,
           :total => 3,
           :xData => [current_date],
           :yData => [3.0]
         },
         :memory => {
+          :dataAvailable => true,
           :used  => 2,
           :total => 3,
           :xData => [current_date],
@@ -382,11 +386,13 @@
       daily_network_trends_single_provider = described_class.new(ems_openshift.id, controller).network_metrics[:xy_data]
 
       expect(daily_network_trends_single_provider).to eq(
+        :dataAvailable => true,
         :xData => [previous_date, current_date],
         :yData => [2000, 1000]
       )
 
       expect(daily_network_trends).to eq(
+        :dataAvailable => true,
         :xData => [previous_date, current_date],
         :yData => [2000, 2500]
       )
@@ -443,15 +449,16 @@
       ems_kubernetes.metric_rollups << nil_fields_metric.dup
 
       hourly_network_trends = described_class.new(nil, controller).network_metrics[:xy_data]
-      hourly_network_trends_single_provider =
-        described_class.new(ems_openshift.id, controller).network_metrics[:xy_data]
+      hourly_network_trends_single_provider = described_class.new(ems_openshift.id, controller).network_metrics[:xy_data]
 
       expect(hourly_network_trends_single_provider).to eq(
+        :dataAvailable => true,
         :xData => [previous_date.beginning_of_hour.utc, current_date.beginning_of_hour.utc],
         :yData => [2000, 1000]
       )
 
       expect(hourly_network_trends).to eq(
+        :dataAvailable => true,
         :xData => [previous_date.beginning_of_hour.utc, current_date.beginning_of_hour.utc],
         :yData => [2000, 2500]
       )