Add recently added cpu_cores_allocated_metric and memory_allocated_me…

…tric

- we are probably allowing both names of metric

app/models/chargeback/consumption_with_rollups.rb

@@ -47,7 +47,7 @@ def avg(metric, sub_metric = nil)
 
     def current_value(metric, _sub_metric) # used for containers allocated metrics
       case metric
-      when 'derived_vm_numvcpu_cores' # Allocated CPU count
+      when 'derived_vm_numvcpu_cores', 'derived_vm_numvcpus_cores' # Allocated CPU count
         resource.try(:limit_cpu_cores).to_f
       when 'derived_memory_available'
         resource.try(:limit_memory_bytes).to_f / 1.megabytes # bytes to megabytes

app/models/metering.rb

@@ -23,6 +23,11 @@ def calculate_costs(consumption, _)
         source = 'used'
       end
 
+      if field == 'cpu_cores_allocated_metric'
+        group = 'cpu_cores'
+        source = 'allocated'
+      end
+
       chargable_field = ChargeableField.find_by(:group => group, :source => source)
       next if field == "existence_hours_metric" || field == "fixed_compute_metric" || chargable_field && chargable_field.metering?
       value = chargable_field.measure_metering(consumption, @options) if chargable_field

app/models/metering_container_image.rb

@@ -8,11 +8,13 @@ class MeteringContainerImage < ChargebackContainerImage
 
   def self.report_col_options
     {
-      "cpu_cores_used_metric" => {:grouping => [:total]},
-      "fixed_compute_metric"  => {:grouping => [:total]},
-      "memory_used_metric"    => {:grouping => [:total]},
-      "metering_used_metric"  => {:grouping => [:total]},
-      "net_io_used_metric"    => {:grouping => [:total]},
+      "cpu_cores_allocated_metric" => {:grouping => [:total]},
+      "cpu_cores_used_metric"      => {:grouping => [:total]},
+      "fixed_compute_metric"       => {:grouping => [:total]},
+      "memory_allocated_metric"    => {:grouping => [:total]},
+      "memory_used_metric"         => {:grouping => [:total]},
+      "metering_used_metric"       => {:grouping => [:total]},
+      "net_io_used_metric"         => {:grouping => [:total]},
     }
   end