Change to 2 digit accuracy in projects dashboard

ManageIQ · Nov 19, 2017 · e3cbf4f · e3cbf4f
1 parent e58e826
commit e3cbf4f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/app/services/container_dashboard_service.rb b/app/services/container_dashboard_service.rb
@@ -2,6 +2,7 @@ class ContainerDashboardService
   include UiServiceMixin
   include ContainerServiceMixin
 
+  DISPLAY_PRECISION = 2 # 2 decimal points
 
   def initialize(provider_id, controller)
     @provider_id = provider_id
@@ -185,15 +186,15 @@ def heatmaps_data(metrics)
         :node     => m.resource.name,
         :provider => provider_name,
         :total    => m.derived_vm_numvcpus.present? ? m.derived_vm_numvcpus.round : nil,
-        :percent  => m.cpu_usage_rate_average.present? ? (m.cpu_usage_rate_average / 100.0).round(CPU_USAGE_PRECISION) : nil # pf accepts fractions 90% = 0.90
+        :percent  => m.cpu_usage_rate_average.present? ? (m.cpu_usage_rate_average / 100.0).round(GRAPH_USAGE_PRECISION) : nil # pf accepts fractions 90% = 0.90
       }
 
       node_memory_usage << {
         :id       => m.resource.id,
         :node     => m.resource.name,
         :provider => m.resource.ext_management_system.name,
         :total    => m.derived_memory_available.present? ? m.derived_memory_available.round : nil,
-        :percent  => m.mem_usage_absolute_average.present? ? (m.mem_usage_absolute_average / 100.0).round(CPU_USAGE_PRECISION) : nil # pf accepts fractions 90% = 0.90
+        :percent  => m.mem_usage_absolute_average.present? ? (m.mem_usage_absolute_average / 100.0).round(GRAPH_USAGE_PRECISION) : nil # pf accepts fractions 90% = 0.90
       }
     end
 

diff --git a/app/services/container_project_dashboard_service.rb b/app/services/container_project_dashboard_service.rb
@@ -1,7 +1,8 @@
 class ContainerProjectDashboardService
   include UiServiceMixin
   include ContainerServiceMixin
-  CPU_USAGE_PRECISION = 2 # 2 decimal points
+
+  DISPLAY_PRECISION = 2 # 2 decimal points
 
   def initialize(project_id, controller)
     @project_id = project_id

diff --git a/app/services/container_service_mixin.rb b/app/services/container_service_mixin.rb
@@ -1,5 +1,6 @@
 module ContainerServiceMixin
-  CPU_USAGE_PRECISION = 2 # 2 decimal points
+  GRAPH_USAGE_PRECISION = 2 # 2 decimal points
+  DISPLAY_PRECISION = 0 # 2 decimal points
   REALTIME_TIME_RANGE = 10 # 10 minutes
 
   def daily_pod_metrics
@@ -63,16 +64,16 @@ def utilization_data(used_cpu, total_cpu, used_mem, total_mem)
     if used_cpu.any?
       {
         :cpu => {
-          :used  => (used_cpu.values.last || 0).round,
+          :used  => (used_cpu.values.last || 0).round(DISPLAY_PRECISION),
           :total => (total_cpu.values.last || 0).round,
           :xData => used_cpu.keys,
-          :yData => used_cpu.values.map(&:round)
+          :yData => used_cpu.values.map { |m| m.round(GRAPH_USAGE_PRECISION) }
         },
         :mem => {
-          :used  => ((used_mem.values.last || 0) / 1024.0).round,
-          :total => ((total_mem.values.last || 0) / 1024.0).round,
+          :used  => ((used_mem.values.last || 0) / 1024.0).round(DISPLAY_PRECISION),
+          :total => ((total_mem.values.last || 0) / 1024.0).round(DISPLAY_PRECISION),
           :xData => used_mem.keys,
-          :yData => used_mem.values.map { |m| ((m || 0) / 1024.0).round }
+          :yData => used_mem.values.map { |m| ((m || 0) / 1024.0).round(GRAPH_USAGE_PRECISION) }
         }
       }
     end

diff --git a/spec/services/container_dashboard_service_spec.rb b/spec/services/container_dashboard_service_spec.rb
@@ -91,13 +91,13 @@
           :used  => 3,
           :total => 3,
           :xData => [current_date.strftime("%Y-%m-%d")],
-          :yData => [3]
+          :yData => [3.0]
         },
         :mem => {
           :used  => 2,
           :total => 3,
           :xData => [current_date.strftime("%Y-%m-%d")],
-          :yData => [2]
+          :yData => [1.5]
         }
       )
     end