Merge pull request #15261 from isimluk/do-not-offer-useless-metrics

Do not offer report columns that are useless
ManageIQ · Jun 6, 2017 · d07a5ef · d07a5ef
2 parents d2f04e9 + 22570ac
commit d07a5ef
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/app/models/chargeback_vm.rb b/app/models/chargeback_vm.rb
@@ -12,7 +12,6 @@ class ChargebackVm < Chargeback
     :cpu_used_cost            => :float,
     :cpu_used_metric          => :float,
     :cpu_cost                 => :float,
-    :cpu_metric               => :float,
     :disk_io_used_cost        => :float,
     :disk_io_used_metric      => :float,
     :fixed_compute_1_cost     => :float,
@@ -24,15 +23,13 @@ class ChargebackVm < Chargeback
     :memory_used_cost         => :float,
     :memory_used_metric       => :float,
     :memory_cost              => :float,
-    :memory_metric            => :float,
     :net_io_used_cost         => :float,
     :net_io_used_metric       => :float,
     :storage_allocated_cost   => :float,
     :storage_allocated_metric => :float,
     :storage_used_cost        => :float,
     :storage_used_metric      => :float,
     :storage_cost             => :float,
-    :storage_metric           => :float,
     :total_cost               => :float,
   )
 
@@ -76,7 +73,6 @@ def self.report_col_options
       "cpu_allocated_cost"       => {:grouping => [:total]},
       "cpu_allocated_metric"     => {:grouping => [:total]},
       "cpu_cost"                 => {:grouping => [:total]},
-      "cpu_metric"               => {:grouping => [:total]},
       "cpu_used_cost"            => {:grouping => [:total]},
       "cpu_used_metric"          => {:grouping => [:total]},
       "disk_io_used_cost"        => {:grouping => [:total]},
@@ -90,15 +86,13 @@ def self.report_col_options
       "memory_allocated_cost"    => {:grouping => [:total]},
       "memory_allocated_metric"  => {:grouping => [:total]},
       "memory_cost"              => {:grouping => [:total]},
-      "memory_metric"            => {:grouping => [:total]},
       "memory_used_cost"         => {:grouping => [:total]},
       "memory_used_metric"       => {:grouping => [:total]},
       "net_io_used_cost"         => {:grouping => [:total]},
       "net_io_used_metric"       => {:grouping => [:total]},
       "storage_allocated_cost"   => {:grouping => [:total]},
       "storage_allocated_metric" => {:grouping => [:total]},
       "storage_cost"             => {:grouping => [:total]},
-      "storage_metric"           => {:grouping => [:total]},
       "storage_used_cost"        => {:grouping => [:total]},
       "storage_used_metric"      => {:grouping => [:total]},
       "total_cost"               => {:grouping => [:total]}