Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix amortised cost calculations #5446

Merged
merged 9 commits into from
Jan 16, 2025
Merged

Fix amortised cost calculations #5446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9562c9
handle EDP and Private rate discounts for amortised cost calculations
lcouzens Jan 15, 2025
653803f
fix stashed push
lcouzens Jan 15, 2025
a8f7bee
fix stashed push again
lcouzens Jan 15, 2025
f784a92
switch statement to handle all outliers
lcouzens Jan 15, 2025
3d6a296
Update reporting_awscostentrylineitem_daily_summary.sql
lcouzens Jan 15, 2025
373b2b5
Merge branch 'main' into handle-edp-private-rate-for-amortised-costs
lcouzens Jan 15, 2025
9a9e98f
correcting sql indent
lcouzens Jan 16, 2025
896572f
comment indent
lcouzens Jan 16, 2025
4963922
comment indent2
lcouzens Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions koku/masu/database/trino_sql/reporting_awscostentrylineitem_daily_summary.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ FROM (
sum(savingsplan_savingsplaneffectivecost) as savingsplan_effective_cost,
sum(
CASE
WHEN lineitem_lineitemtype='Tax'
OR lineitem_lineitemtype='Usage'
THEN lineitem_unblendedcost
ELSE savingsplan_savingsplaneffectivecost
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
OR lineitem_lineitemtype='SavingsPlanNegation'
THEN savingsplan_savingsplaneffectivecost
ELSE lineitem_unblendedcost
END
) as calculated_amortized_cost,
sum(pricing_publicondemandcost) as public_on_demand_cost,
Expand Down
100 changes: 50 additions & 50 deletions koku/masu/database/trino_sql/reporting_awscostentrylineitem_summary_by_ec2_compute_p.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,58 +112,58 @@ SELECT uuid() as uuid,
aa.id as account_alias_id
FROM (
SELECT min(date(lineitem_usagestartdate)) as usage_start,
max(date(lineitem_usagestartdate)) as usage_end,
max(lineitem_usageaccountid) as usage_account_id,
lineitem_resourceid as resource_id,
max(nullif(product_operatingsystem, '')) as operating_system,
max(nullif(product_region, '')) as region,
max(nullif(pricing_unit, '')) as unit,
-- SavingsPlanNegation needs to be negated to prevent duplicate usage COST-5369
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanNegation'
THEN 0.0
ELSE lineitem_usageamount
END
) as usage_amount,
max(lineitem_normalizationfactor) as normalization_factor,
sum(lineitem_normalizedusageamount) as normalized_usage_amount,
max(lineitem_currencycode) as currency_code,
max(lineitem_unblendedrate) as unblended_rate,
/* SavingsPlanCoveredUsage entries have corresponding SavingsPlanNegation line items
that offset that cost.
https://docs.aws.amazon.com/cur/latest/userguide/cur-sp.html
*/
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
THEN 0.0
ELSE lineitem_unblendedcost
END
) as unblended_cost,
max(lineitem_blendedrate) as blended_rate,
max(date(lineitem_usagestartdate)) as usage_end,
max(lineitem_usageaccountid) as usage_account_id,
lineitem_resourceid as resource_id,
max(nullif(product_operatingsystem, '')) as operating_system,
max(nullif(product_region, '')) as region,
max(nullif(pricing_unit, '')) as unit,
-- SavingsPlanNegation needs to be negated to prevent duplicate usage COST-5369
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanNegation'
THEN 0.0
ELSE lineitem_usageamount
END
) as usage_amount,
max(lineitem_normalizationfactor) as normalization_factor,
sum(lineitem_normalizedusageamount) as normalized_usage_amount,
max(lineitem_currencycode) as currency_code,
max(lineitem_unblendedrate) as unblended_rate,
/* SavingsPlanCoveredUsage entries have corresponding SavingsPlanNegation line items
that offset that cost.
https://docs.aws.amazon.com/cur/latest/userguide/cur-sp.html
*/
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
THEN 0.0
ELSE lineitem_unblendedcost
END
) as unblended_cost,
max(lineitem_blendedrate) as blended_rate,
/* SavingsPlanCoveredUsage entries have corresponding SavingsPlanNegation line items
that offset that cost.
https://docs.aws.amazon.com/cur/latest/userguide/cur-sp.html
that offset that cost.
https://docs.aws.amazon.com/cur/latest/userguide/cur-sp.html
*/
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
THEN 0.0
ELSE lineitem_blendedcost
END
) as blended_cost,
sum(savingsplan_savingsplaneffectivecost) as savingsplan_effective_cost,
sum(
CASE
WHEN lineitem_lineitemtype='Tax'
OR lineitem_lineitemtype='Usage'
THEN lineitem_unblendedcost
ELSE savingsplan_savingsplaneffectivecost
END
) as calculated_amortized_cost,
sum(pricing_publicondemandcost) as public_on_demand_cost,
max(pricing_publicondemandrate) as public_on_demand_rate
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
THEN 0.0
ELSE lineitem_blendedcost
END
) as blended_cost,
sum(savingsplan_savingsplaneffectivecost) as savingsplan_effective_cost,
sum(
CASE
WHEN lineitem_lineitemtype='SavingsPlanCoveredUsage'
OR lineitem_lineitemtype='SavingsPlanNegation'
THEN savingsplan_savingsplaneffectivecost
ELSE lineitem_unblendedcost
END
) as calculated_amortized_cost,
sum(pricing_publicondemandcost) as public_on_demand_cost,
max(pricing_publicondemandrate) as public_on_demand_rate
FROM hive.{{schema | sqlsafe}}.aws_line_items_daily as lid
WHERE source = '{{source_uuid | sqlsafe}}'
AND year = '{{year | sqlsafe}}'
Expand Down
Loading