Skip to content

Commit d05f26e

Browse files
megareezmegareez
authored
Merge pull request #248 from aws-samples/optimized-summary-view
summary_view update
2 parents c882909 + b6a891f commit d05f26e

File tree

5 files changed

+115
-111
lines changed

5 files changed

+115
-111
lines changed

‎cid/builtin/core/data/queries/cid/ec2_running_cost_ri.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
, "date_trunc"('hour', "line_item_usage_start_date") "usage_date"
77
, "bill_payer_account_id" "payer_account_id"
88
, "line_item_usage_account_id" "linked_account_id"
9-
, (CASE
10-
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
11-
WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
12-
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
9+
, (CASE
10+
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
11+
WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
12+
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
1313
ELSE 'OnDemand' END) "purchase_option"
1414
, "sum"(CASE
1515
-- WHEN "line_item_line_item_type" = 'SavingsPlanCoveredUsage' THEN "savings_plan_savings_plan_effective_cost"
@@ -20,10 +20,10 @@
2020
FROM
2121
"${cur_table_name}"
2222
WHERE (
23-
("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL '1' MONTH)) AND ("line_item_product_code" = 'AmazonEC2') AND ("product_servicecode" <> 'AWSDataTransfer') AND ("line_item_operation" LIKE '%RunInstances%') AND ("line_item_usage_type" NOT LIKE '%DataXfer%') AND
24-
(("line_item_line_item_type" = 'Usage')
23+
("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL '1' MONTH)) AND ("line_item_product_code" = 'AmazonEC2') AND ("product_servicecode" <> 'AWSDataTransfer') AND ("line_item_operation" LIKE '%RunInstances%') AND ("line_item_usage_type" NOT LIKE '%DataXfer%') AND
24+
(("line_item_line_item_type" = 'Usage')
2525
-- OR
26-
-- ("line_item_line_item_type" = 'SavingsPlanCoveredUsage')
27-
OR
26+
-- ("line_item_line_item_type" = 'SavingsPlanCoveredUsage')
27+
OR
2828
("line_item_line_item_type" = 'DiscountedUsage')))
2929
GROUP BY 1, 2, 3, 4,5,6,7

‎cid/builtin/core/data/queries/cid/summary_view.sql‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,44 @@
33
"year"
44
, "month"
55
, "bill_billing_period_start_date" "billing_period"
6-
, "date_trunc"('day', "line_item_usage_start_date") "usage_date"
6+
, CASE
7+
WHEN ("date_trunc"('month',"line_item_usage_start_date")) >= ("date_trunc"('month', current_timestamp) - INTERVAL '3' MONTH) THEN "date_trunc"('day', "line_item_usage_start_date") ELSE "date_trunc"('month', "line_item_usage_start_date") END "usage_date"
78
, "bill_payer_account_id" "payer_account_id"
89
, "line_item_usage_account_id" "linked_account_id"
910
, "bill_invoice_id" "invoice_id"
1011
, "line_item_line_item_type" "charge_type"
11-
, CASE
12-
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN 'Running_Usage'
13-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN 'Running_Usage'
14-
WHEN ("line_item_line_item_type" = 'Usage') THEN 'Running_Usage'
12+
, CASE
13+
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN 'Running_Usage'
14+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN 'Running_Usage'
15+
WHEN ("line_item_line_item_type" = 'Usage') THEN 'Running_Usage'
1516
ELSE 'non_usage' END "charge_category"
16-
, CASE
17-
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
18-
-- WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
19-
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
17+
, CASE
18+
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
19+
-- WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
20+
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
2021
ELSE 'OnDemand' END "purchase_option"
21-
,CASE
22-
WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n"
22+
,CASE
23+
WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n"
2324
-- WHEN ("reservation_reservation_a_r_n" <> '') THEN "reservation_reservation_a_r_n"
24-
WHEN ("line_item_line_item_type" = 'Usage') THEN ''
25+
WHEN ("line_item_line_item_type" = 'Usage') THEN ''
2526
ELSE '' END "ri_sp_arn"
2627
, "line_item_product_code" "product_code"
2728
, "product_product_name" "product_name"
28-
, CASE
29-
WHEN ("bill_billing_entity" = 'AWS Marketplace' AND "line_item_line_item_type" NOT LIKE '%Discount%') THEN "Product_Product_Name"
29+
, CASE
30+
WHEN ("bill_billing_entity" = 'AWS Marketplace' AND "line_item_line_item_type" NOT LIKE '%Discount%') THEN "Product_Product_Name"
3031
WHEN ("product_servicecode" = '') THEN "line_item_product_code" ELSE "product_servicecode" END "service"
3132
, "product_product_family" "product_family"
3233
, "line_item_usage_type" "usage_type"
3334
, "line_item_operation" "operation"
3435
, "line_item_line_item_description" "item_description"
3536
, "line_item_availability_zone" "availability_zone"
3637
, "product_region" "region"
37-
, CASE
38+
, CASE
3839
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("line_item_line_item_description", '.', 1) ELSE "product_instance_type_family" END "instance_type_family"
39-
, CASE
40+
, CASE
4041
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("line_item_line_item_description", ' ', 1) ELSE "product_instance_type" END "instance_type"
41-
, CASE
42-
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("split_part"("line_item_line_item_description", ' ', 2), '/', 1) ELSE "product_operating_system" END "platform"
42+
, CASE
43+
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("split_part"("line_item_line_item_description", ' ', 2), '/', 1) ELSE "product_operating_system" END "platform"
4344
, "product_tenancy" "tenancy"
4445
, "product_physical_processor" "processor"
4546
, "product_processor_features" "processor_features"
@@ -52,34 +53,34 @@
5253
, "bill_billing_entity" "billing_entity"
5354
, "pricing_unit" "pricing_unit"
5455
, "count"(DISTINCT "Line_item_resource_id") "resource_id_count"
55-
, sum(CASE
56-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "line_item_usage_amount"
57-
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "line_item_usage_amount"
58-
WHEN ("line_item_line_item_type" = 'Usage') THEN "line_item_usage_amount"
56+
, sum(CASE
57+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "line_item_usage_amount"
58+
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "line_item_usage_amount"
59+
WHEN ("line_item_line_item_type" = 'Usage') THEN "line_item_usage_amount"
5960
ELSE 0 END) "usage_quantity"
6061
, sum ("line_item_unblended_cost") "unblended_cost"
6162
, sum(CASE
6263
WHEN ("line_item_line_item_type" = 'Usage') THEN "line_item_unblended_cost"
63-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "savings_plan_savings_plan_effective_cost"
64-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN ("savings_plan_total_commitment_to_date" - "savings_plan_used_commitment")
64+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "savings_plan_savings_plan_effective_cost"
65+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN ("savings_plan_total_commitment_to_date" - "savings_plan_used_commitment")
6566
-- WHEN ("line_item_line_item_type" = 'SavingsPlanNegation') THEN 0
6667
-- WHEN ("line_item_line_item_type" = 'SavingsPlanUpfrontFee') THEN 0
67-
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "reservation_effective_cost"
68+
-- WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "reservation_effective_cost"
6869
-- WHEN ("line_item_line_item_type" = 'RIFee') THEN ("reservation_unused_amortized_upfront_fee_for_billing_period" + "reservation_unused_recurring_fee")
69-
-- WHEN (("line_item_line_item_type" = 'Fee') AND ("reservation_reservation_a_r_n" <> '')) THEN 0
70+
-- WHEN (("line_item_line_item_type" = 'Fee') AND ("reservation_reservation_a_r_n" <> '')) THEN 0
7071
ELSE "line_item_unblended_cost" END) "amortized_cost"
7172
, CAST(sum(CASE
7273
WHEN (line_item_line_item_type = 'Usage') THEN 0
73-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN (-"savings_plan_amortized_upfront_commitment_for_billing_period")
74-
-- WHEN ("line_item_line_item_type" = 'RIFee') THEN (-"reservation_amortized_upfront_fee_for_billing_period")
74+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN (-"savings_plan_amortized_upfront_commitment_for_billing_period")
75+
-- WHEN ("line_item_line_item_type" = 'RIFee') THEN (-"reservation_amortized_upfront_fee_for_billing_period")
7576
ELSE 0 END) AS double) "ri_sp_trueup"
7677
, CAST(sum(CASE
7778
WHEN ("line_item_line_item_type" = 'Usage') THEN 0
7879
-- WHEN ("line_item_line_item_type" = 'SavingsPlanUpfrontFee') THEN "line_item_unblended_cost"
7980
-- WHEN (("line_item_line_item_type" = 'Fee') AND ("reservation_reservation_a_r_n" <> '')) THEN "line_item_unblended_cost"
8081
ELSE 0 END) AS double) "ri_sp_upfront_fees"
8182
, sum(CASE
82-
WHEN ("line_item_line_item_type" <> 'SavingsPlanNegation') THEN "pricing_public_on_demand_cost" ELSE 0 END) "public_cost"
83+
WHEN ("line_item_line_item_type" <> 'SavingsPlanNegation') THEN "pricing_public_on_demand_cost" ELSE 0 END) "public_cost"
8384
FROM
8485
"${cur_table_name}"
8586
WHERE (("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL '7' MONTH)) AND (CAST("concat"("year", '-', "month", '-01') AS date) >= ("date_trunc"('month', current_date) - INTERVAL '7' MONTH)))

‎cid/builtin/core/data/queries/cid/summary_view_ri.sql‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,41 @@
33
"year"
44
, "month"
55
, "bill_billing_period_start_date" "billing_period"
6-
, "date_trunc"('day', "line_item_usage_start_date") "usage_date"
6+
, CASE
7+
WHEN ("date_trunc"('month',"line_item_usage_start_date")) >= ("date_trunc"('month', current_timestamp) - INTERVAL '3' MONTH) THEN "date_trunc"('day', "line_item_usage_start_date") ELSE "date_trunc"('month', "line_item_usage_start_date") END "usage_date"
78
, "bill_payer_account_id" "payer_account_id"
89
, "line_item_usage_account_id" "linked_account_id"
910
, "bill_invoice_id" "invoice_id"
1011
, "line_item_line_item_type" "charge_type"
11-
, CASE
12-
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN 'Running_Usage'
13-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN 'Running_Usage'
12+
, CASE
13+
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN 'Running_Usage'
14+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN 'Running_Usage'
1415
WHEN ("line_item_line_item_type" = 'Usage') THEN 'Running_Usage' ELSE 'non_usage' END "charge_category"
15-
, CASE
16-
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
17-
WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
18-
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
16+
, CASE
17+
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
18+
WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
19+
WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
1920
ELSE 'OnDemand' END "purchase_option"
20-
, CASE
21-
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n"
21+
, CASE
22+
-- WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n"
2223
WHEN ("reservation_reservation_a_r_n" <> '') THEN "reservation_reservation_a_r_n" ELSE '' END "ri_sp_arn"
2324
, "line_item_product_code" "product_code"
2425
, "product_product_name" "product_name"
25-
, CASE
26-
WHEN ("bill_billing_entity" = 'AWS Marketplace' AND "line_item_line_item_type" NOT LIKE '%Discount%') THEN "Product_Product_Name"
26+
, CASE
27+
WHEN ("bill_billing_entity" = 'AWS Marketplace' AND "line_item_line_item_type" NOT LIKE '%Discount%') THEN "Product_Product_Name"
2728
WHEN ("product_servicecode" = '') THEN "line_item_product_code" ELSE "product_servicecode" END "service"
2829
, "product_product_family" "product_family"
2930
, "line_item_usage_type" "usage_type"
3031
, "line_item_operation" "operation"
3132
, "line_item_line_item_description" "item_description"
3233
, "line_item_availability_zone" "availability_zone"
3334
, "product_region" "region"
34-
, CASE
35+
, CASE
3536
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("line_item_line_item_description", '.', 1) ELSE "product_instance_type_family" END "instance_type_family"
36-
, CASE
37+
, CASE
3738
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("line_item_line_item_description", ' ', 1) ELSE "product_instance_type" END "instance_type"
38-
, CASE
39-
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("split_part"("line_item_line_item_description", ' ', 2), '/', 1) ELSE "product_operating_system" END "platform"
39+
, CASE
40+
WHEN (("line_item_usage_type" LIKE '%Spot%') AND ("line_item_product_code" = 'AmazonEC2') AND ("line_item_line_item_type" = 'Usage')) THEN "split_part"("split_part"("line_item_line_item_description", ' ', 2), '/', 1) ELSE "product_operating_system" END "platform"
4041
, "product_tenancy" "tenancy"
4142
, "product_physical_processor" "processor"
4243
, "product_processor_features" "processor_features"
@@ -49,29 +50,29 @@
4950
, "bill_billing_entity" "billing_entity"
5051
, "pricing_unit" "pricing_unit"
5152
, "count"(DISTINCT "Line_item_resource_id") "resource_id_count"
52-
, sum(CASE
53-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "line_item_usage_amount"
54-
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "line_item_usage_amount"
53+
, sum(CASE
54+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "line_item_usage_amount"
55+
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "line_item_usage_amount"
5556
WHEN ("line_item_line_item_type" = 'Usage') THEN "line_item_usage_amount" ELSE 0 END) "usage_quantity"
5657
, sum ("line_item_unblended_cost") "unblended_cost"
5758
, sum(CASE
58-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "savings_plan_savings_plan_effective_cost"
59-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN ("savings_plan_total_commitment_to_date" - "savings_plan_used_commitment")
59+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanCoveredUsage') THEN "savings_plan_savings_plan_effective_cost"
60+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN ("savings_plan_total_commitment_to_date" - "savings_plan_used_commitment")
6061
-- WHEN ("line_item_line_item_type" = 'SavingsPlanNegation') THEN 0
6162
-- WHEN ("line_item_line_item_type" = 'SavingsPlanUpfrontFee') THEN 0
62-
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "reservation_effective_cost"
63+
WHEN ("line_item_line_item_type" = 'DiscountedUsage') THEN "reservation_effective_cost"
6364
WHEN ("line_item_line_item_type" = 'RIFee') THEN ("reservation_unused_amortized_upfront_fee_for_billing_period" + "reservation_unused_recurring_fee")
6465
WHEN (("line_item_line_item_type" = 'Fee') AND ("reservation_reservation_a_r_n" <> '')) THEN 0 ELSE "line_item_unblended_cost" END) "amortized_cost"
6566
, sum(CASE
66-
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN (-"savings_plan_amortized_upfront_commitment_for_billing_period")
67+
-- WHEN ("line_item_line_item_type" = 'SavingsPlanRecurringFee') THEN (-"savings_plan_amortized_upfront_commitment_for_billing_period")
6768
WHEN ("line_item_line_item_type" = 'RIFee') THEN (-"reservation_amortized_upfront_fee_for_billing_period") ELSE 0 END) "ri_sp_trueup"
6869
, sum(CASE
6970
-- WHEN ("line_item_line_item_type" = 'SavingsPlanUpfrontFee') THEN "line_item_unblended_cost"
7071
WHEN (("line_item_line_item_type" = 'Fee') AND ("reservation_reservation_a_r_n" <> '')) THEN "line_item_unblended_cost" ELSE 0 END) "ri_sp_upfront_fees"
7172
, sum(CASE
72-
WHEN ("line_item_line_item_type" <> 'SavingsPlanNegation') THEN "pricing_public_on_demand_cost" ELSE 0 END) "public_cost"
73+
WHEN ("line_item_line_item_type" <> 'SavingsPlanNegation') THEN "pricing_public_on_demand_cost" ELSE 0 END) "public_cost"
7374
FROM
7475
"${cur_table_name}"
7576
WHERE (("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL '7' MONTH)) AND (CAST("concat"("year", '-', "month", '-01') AS date) >= ("date_trunc"('month', current_date) - INTERVAL '7' MONTH)))
76-
77+
7778
GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,33,34

0 commit comments

Comments
 (0)