New chargeback calculations #11648

lpichler · 2016-10-03T07:20:55Z

https://bugzilla.redhat.com/show_bug.cgi?id=1349413

Changes taking into account averages and maximums per selected interval in report(monthly, weekly, daily).
In general for allocated metric is used maximum and for used metrics is used average.

chargio · 2016-10-03T08:18:26Z

This starts to look great!

miq-bot · 2016-10-03T12:16:20Z

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

lpichler · 2016-10-11T12:19:17Z

@miq-bot remove_label wip

lpichler · 2016-10-11T16:23:51Z

app/models/chargeback.rb

+          cost = 0
+        else
+          metric_value = r.metric_value_by(metric_rollup_records)
+          cost = r.cost(metric_value) * hours_in_interval


@gtanzillo I move out multiplying of cost method because we don't need it calculate (because we are not using accuntable period) separately fixed and variable part.

lpichler · 2016-10-11T16:24:16Z

@gtanzillo PR updated.

gtanzillo

All the calculations look perfect 👍 except for the "Storage Allocated Cost" where it seems there was a bug in the original rate tiers code.

gtanzillo · 2016-10-14T19:24:30Z

app/models/chargeback_rate_detail.rb

    (fixed_rate, variable_rate) = find_rate(value)
-    hourly(fixed_rate) + hourly(variable_rate) * value
+
+    hourly(fixed_rate) +  hourly(variable_rate) * value


@lpichler I found a bug in this calculation when I was trying to verify the value for "Storage allocated Cost". It was showing 0 when it should be $29,760.00 => (1.0 fixed cost * 40gb * 744 hours).

It's incorrect because there should be parens around hourly(fixed_rate) + hourly(variable_rate). I made this change locally and got the correct cost:

diff --git a/app/models/chargeback_rate_detail.rb b/app/models/chargeback_rate_detail.rb index 651249a..f9ac46e 100644 --- a/app/models/chargeback_rate_detail.rb +++ b/app/models/chargeback_rate_detail.rb @@ -72,7 +72,7 @@ class ChargebackRateDetail < ApplicationRecord (fixed_rate, variable_rate) = find_rate(value) - hourly(fixed_rate) + hourly(variable_rate) * value + (hourly(fixed_rate) + hourly(variable_rate)) * value end def hourly(rate)

It looks like this was introduced with the tiered rates feature.

Here are before and after shot of the report so that you have a frame of reference -
Before

After

@gtanzillo Nice finding, but I need to confirm these calculation which was used for it:
There are used this calculations:

I guess that was used this rate for Storage Allocate Cost:
Fixed: $1
Variable: $0
Per Time: Hourly
Per Unit: GB

Report setttings: Monthly

I guess fixed part should not be depend on metric value (value of Storage Allocate):
Hourly rate for GB: $1 (we have it already in hours)
Hourly rate for B(bytes, it is unit in MetricRollup table):$1 / (1024)^3 = 9.313225746154785e-10

9.313225746154785e-10 * 744(hours in month) = 6.92903995513916e-07

and in report it was rounded to $0.

Can you confirm it please ?

After working through this with @lpichler and confirming with @sergio-ocon, we came up with a slightly different change -

diff --git a/app/models/chargeback_rate_detail.rb b/app/models/chargeback_rate_detail.rb index 651249a..0ebbd48 100644 --- a/app/models/chargeback_rate_detail.rb +++ b/app/models/chargeback_rate_detail.rb @@ -72,10 +72,10 @@ class ChargebackRateDetail < ApplicationRecord (fixed_rate, variable_rate) = find_rate(value) - hourly(fixed_rate) + hourly(variable_rate) * value + hourly(fixed_rate, true) + (hourly(variable_rate) * value) end - def hourly(rate) + def hourly(rate, fixed=nil) hourly_rate = case per_time when "hourly" then rate when "daily" then rate / 24 @@ -85,7 +85,7 @@ class ChargebackRateDetail < ApplicationRecord else raise "rate time unit of '#{per_time}' not supported" end - rate_adjustment(hourly_rate) + fixed ? hourly_rate : rate_adjustment(hourly_rate) end # Scale the rate in the unit difine by user to the default unit of the metric

Fixed rates whether in a tier or in fixed compute or storage should not involve the value of any metric. The only exception a fixed rate is in a tier, the metric value is used to find the correct tier, but in the calculation of the fixed cost.

See this screen shot for reference.

thanks @gtanzillo for finding it - I made change in separated commit
0b6e9d6

I did it in slightly different way to see that only hourly variable part is adjusted regard to default unit metric in MetricRollup table.

gtanzillo · 2016-10-14T19:36:35Z

@zeari @bazulay @simon3z - fyi, this is the PR with all the new calculations for rolling up metrics and costs.

as test example is used month with 30 days

miq-bot · 2016-10-19T07:32:30Z

Checked commits lpichler/manageiq@f3506b7~...bdaad80 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
6 files checked, 1 offense detected

app/models/chargeback_rate_detail.rb

❗ - Line 73, Col 23 - Style/RedundantSelf - Redundant self detected.

lpichler · 2016-10-19T13:39:53Z

@miq-bot remove_label wip

lpichler · 2016-10-19T13:45:33Z

@gtanzillo I just corrected calculation of hourly rate, when rate is monthly. It doesn't reflect real count of days in month before.

gtanzillo · 2016-10-19T21:37:46Z

👍 This one is ready to go!

lpichler · 2016-10-20T08:18:31Z

there is a list PRs which need to be merged first

#11645 (already backported to euwe)
#11647 (not backported to euwe)
#11685 (not backported to euwe)

chessbyte · 2016-10-21T15:26:39Z

Euwe BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1346047

New chargeback calculations (cherry picked from commit 63996cc) https://bugzilla.redhat.com/show_bug.cgi?id=1346047

chessbyte · 2016-10-21T15:27:09Z

Euwe Backport details:

$ git log -1
commit d1b8be27e9d2208967d52fdb2bcc2326fd0c53a6
Author: Gregg Tanzillo <gtanzill@redhat.com>
Date:   Wed Oct 19 17:37:49 2016 -0400

    Merge pull request #11648 from lpichler/new_chargeback_calculations

    New chargeback calculations
    (cherry picked from commit 63996cc5ca543e61d4083af7554701ee21082130)

    https://bugzilla.redhat.com/show_bug.cgi?id=1346047

In this PR ManageIQ#11648 we introduced selecting rates according to first MetricRollup record of group. We can do it because group of these records belong to one resource. Selection is based on MetricRollup#parent_host or parent_ems_cluster or parent_storage or parent_ems but sometimes this fields in MetricRollup are nil and it produces empty cells on the report - it is because proper rate was not selected. Fix provides that we are selecting parents from the resource direcly when there are not exists in MetricRollup.

chessbyte · 2016-11-04T13:38:06Z

Backported to Darga via #12093

miq-bot added the wip label Oct 3, 2016

lpichler force-pushed the new_chargeback_calculations branch from 876a0c7 to 81a161e Compare October 6, 2016 11:06

chessbyte assigned gtanzillo Oct 6, 2016

chessbyte added the core/chargeback label Oct 6, 2016

lpichler force-pushed the new_chargeback_calculations branch 8 times, most recently from 2cd041b to a3bf026 Compare October 11, 2016 12:18

lpichler changed the title ~~[WIP] new chargeback calculations~~ New chargeback calculations Oct 11, 2016

miq-bot removed the wip label Oct 11, 2016

lpichler force-pushed the new_chargeback_calculations branch from a3bf026 to 26881c3 Compare October 11, 2016 16:15

lpichler commented Oct 11, 2016

View reviewed changes

lpichler force-pushed the new_chargeback_calculations branch from 26881c3 to 66c3222 Compare October 13, 2016 13:33

gtanzillo suggested changes Oct 14, 2016

View reviewed changes

lpichler mentioned this pull request Oct 17, 2016

Add monthly/hourly/weekly in rates for 'per time' types #11733

Merged

lpichler force-pushed the new_chargeback_calculations branch 5 times, most recently from 01f491a to 4c46e41 Compare October 17, 2016 17:48

new chargeback calculations

f3506b7

Fix specs to reflect real count of hours

bdaad80

as test example is used month with 30 days

lpichler force-pushed the new_chargeback_calculations branch from c7f1e63 to bdaad80 Compare October 19, 2016 07:27

lpichler changed the title ~~[WIP] New chargeback calculations~~ New chargeback calculations Oct 19, 2016

miq-bot removed the wip label Oct 19, 2016

gtanzillo added the euwe/yes label Oct 19, 2016

gtanzillo added this to the Sprint 48 Ending Oct 24, 2016 milestone Oct 19, 2016

gtanzillo merged commit 63996cc into ManageIQ:master Oct 19, 2016

lpichler mentioned this pull request Oct 20, 2016

Move reportable metric and cost fields to method #11647

Merged

lpichler mentioned this pull request Oct 21, 2016

[DARGA] New chargeback calculations #12093

Merged

chessbyte pushed a commit that referenced this pull request Oct 21, 2016

Merge pull request #11648 from lpichler/new_chargeback_calculations

d1b8be2

New chargeback calculations (cherry picked from commit 63996cc) https://bugzilla.redhat.com/show_bug.cgi?id=1346047

chessbyte added enhancement euwe/backported and removed euwe/yes labels Oct 21, 2016

lpichler mentioned this pull request Oct 25, 2016

Use parents from resource when there are not exist in MetricRollup #12164

Merged

chessbyte added the darga/yes label Nov 4, 2016

chessbyte added darga/backported and removed darga/yes labels Nov 4, 2016

lpichler deleted the new_chargeback_calculations branch March 3, 2017 09:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New chargeback calculations #11648

New chargeback calculations #11648

lpichler commented Oct 3, 2016 •

edited

chargio commented Oct 3, 2016

miq-bot commented Oct 3, 2016

lpichler commented Oct 11, 2016

lpichler Oct 11, 2016

lpichler commented Oct 11, 2016

gtanzillo left a comment

gtanzillo Oct 14, 2016

lpichler Oct 17, 2016

gtanzillo Oct 17, 2016

lpichler Oct 17, 2016

gtanzillo commented Oct 14, 2016

miq-bot commented Oct 19, 2016

lpichler commented Oct 19, 2016

lpichler commented Oct 19, 2016

gtanzillo commented Oct 19, 2016

lpichler commented Oct 20, 2016

chessbyte commented Oct 21, 2016

chessbyte commented Oct 21, 2016

chessbyte commented Nov 4, 2016

New chargeback calculations #11648

New chargeback calculations #11648

Conversation

lpichler commented Oct 3, 2016 • edited

chargio commented Oct 3, 2016

miq-bot commented Oct 3, 2016

lpichler commented Oct 11, 2016

lpichler Oct 11, 2016

Choose a reason for hiding this comment

lpichler commented Oct 11, 2016

gtanzillo left a comment

Choose a reason for hiding this comment

gtanzillo Oct 14, 2016

Choose a reason for hiding this comment

lpichler Oct 17, 2016

Choose a reason for hiding this comment

gtanzillo Oct 17, 2016

Choose a reason for hiding this comment

lpichler Oct 17, 2016

Choose a reason for hiding this comment

gtanzillo commented Oct 14, 2016

miq-bot commented Oct 19, 2016

lpichler commented Oct 19, 2016

lpichler commented Oct 19, 2016

gtanzillo commented Oct 19, 2016

lpichler commented Oct 20, 2016

chessbyte commented Oct 21, 2016

chessbyte commented Oct 21, 2016

chessbyte commented Nov 4, 2016

lpichler commented Oct 3, 2016 •

edited