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

Divide unattributed storage cost by # of clusters utilizing disk #5447

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Divide unattributed storage cost by # of clusters utilizing disk #5447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15806c4
Divide unattributed storage cost by # of clusters utilzing disk
myersCody Jan 15, 2025
368e835
Clean up
myersCody Jan 15, 2025
80764c0
Remove comma
myersCody Jan 16, 2025
917b65a
Merge branch 'main' into multi-cluster-volume
myersCody Jan 16, 2025
4b0c63f
Merge branch 'main' into multi-cluster-volume
myersCody Jan 17, 2025
0e6db91
Merge branch 'main' into multi-cluster-volume
myersCody Jan 17, 2025
0767ef0
Merge branch 'main' into multi-cluster-volume
myersCody Jan 17, 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
24 changes: 13 additions & 11 deletions koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,12 +743,14 @@ INSERT INTO hive.{{schema | sqlsafe}}.reporting_ocpawscostlineitem_project_daily
WITH cte_total_pv_capacity as (
SELECT
aws_resource_id,
SUM(combined_requests.capacity) as total_pv_capacity
SUM(combined_requests.capacity) as total_pv_capacity,
count(distinct cluster_id) as cluster_count
FROM (
SELECT
ocp.persistentvolume,
max(ocp.persistentvolumeclaim_capacity_gigabyte) as capacity,
aws.resource_id as aws_resource_id
aws.resource_id as aws_resource_id,
ocp.cluster_id
FROM hive.{{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary as ocp
JOIN hive.{{schema | sqlsafe}}.aws_openshift_daily_resource_matched_temp as aws
ON (aws.usage_start = ocp.usage_start)
Expand All @@ -762,7 +764,7 @@ WITH cte_total_pv_capacity as (
AND aws.ocp_source = {{ocp_source_uuid}}
AND aws.year = {{year}}
AND aws.month = {{month}}
GROUP BY ocp.persistentvolume, aws.resource_id
GROUP BY ocp.persistentvolume, aws.resource_id, ocp.cluster_id
) as combined_requests group by aws_resource_id
)
SELECT cast(uuid() as varchar) as aws_uuid, -- need a new uuid or it will deduplicate
Expand All @@ -785,14 +787,14 @@ SELECT cast(uuid() as varchar) as aws_uuid, -- need a new uuid or it will dedup
max(aws.unit) as unit,
cast(NULL as double) as usage_amount,
max(aws.currency_code) as currency_code,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.unblended_cost) as unblended_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.unblended_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.blended_cost) as blended_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.blended_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost_blended,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.savingsplan_effective_cost) as savingsplan_effective_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.savingsplan_effective_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost_savingsplan,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.calculated_amortized_cost) as calculated_amortized_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.calculated_amortized_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost_amortized,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.unblended_cost) / max(pv_cap.cluster_count) as unblended_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.unblended_cost)) * cast({{markup}} as decimal(24,9)) / max(pv_cap.cluster_count) as markup_cost,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.blended_cost) / max(pv_cap.cluster_count) as blended_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.blended_cost)) * cast({{markup}} as decimal(24,9)) / max(pv_cap.cluster_count) as markup_cost_blended,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.savingsplan_effective_cost) / max(pv_cap.cluster_count) as savingsplan_effective_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.savingsplan_effective_cost)) * cast({{markup}} as decimal(24,9)) / max(pv_cap.cluster_count) as markup_cost_savingsplan,
(max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.calculated_amortized_cost) / max(pv_cap.cluster_count) as calculated_amortized_cost,
((max(aws_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(aws_disk.capacity) * max(aws.calculated_amortized_cost)) * cast({{markup}} as decimal(24,9)) / max(pv_cap.cluster_count) as markup_cost_amortized,
max(aws.resource_id_matched) as resource_id_matched,
{{ocp_source_uuid}} as ocp_source,
max(aws.year) as year,
Expand Down
12 changes: 7 additions & 5 deletions koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,12 +496,14 @@ INSERT INTO hive.{{schema | sqlsafe}}.reporting_ocpazurecostlineitem_project_dai
WITH cte_total_pv_capacity as (
SELECT
azure_resource_id,
SUM(combined_requests.capacity) as total_pv_capacity
SUM(combined_requests.capacity) as total_pv_capacity,
count(distinct cluster_id) as cluster_count
FROM (
SELECT
ocp.persistentvolume,
max(ocp.persistentvolumeclaim_capacity_gigabyte) as capacity,
azure.resource_id as azure_resource_id
azure.resource_id as azure_resource_id,
ocp.cluster_id
FROM hive.{{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary as ocp
JOIN hive.{{schema | sqlsafe}}.azure_openshift_daily_resource_matched_temp as azure
ON (azure.usage_start = ocp.usage_start)
Expand All @@ -517,7 +519,7 @@ WITH cte_total_pv_capacity as (
AND azure.ocp_source = {{ocp_source_uuid}}
AND azure.year = {{year}}
AND azure.month = {{month}}
GROUP BY ocp.persistentvolume, azure.resource_id
GROUP BY ocp.persistentvolume, azure.resource_id, ocp.cluster_id
) as combined_requests group by azure_resource_id
)
SELECT cast(uuid() as varchar) as azure_uuid, -- need a new uuid or it will deduplicate
Expand All @@ -538,8 +540,8 @@ SELECT cast(uuid() as varchar) as azure_uuid, -- need a new uuid or it will dedu
max(nullif(azure.resource_location, '')) as resource_location,
'GB-Mo' as unit_of_measure, -- Has to have this unit to show up on storage endpoint
max(azure.currency) as currency,
(max(az_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(az_disk.capacity) * max(azure.pretax_cost) as pretax_cost,
((max(az_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(az_disk.capacity) * max(azure.pretax_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost, -- pretax_cost x markup = markup_cost
(max(az_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(az_disk.capacity) * max(azure.pretax_cost) / max(pv_cap.cluster_count) as pretax_cost,
((max(az_disk.capacity) - max(pv_cap.total_pv_capacity)) / max(az_disk.capacity) * max(azure.pretax_cost)) * cast({{markup}} as decimal(24,9)) / max(pv_cap.cluster_count) as markup_cost, -- pretax_cost x markup = markup_cost
max(azure.resource_id_matched) as resource_id_matched,
{{ocp_source_uuid}} as ocp_source,
max(azure.year) as year,
Expand Down
Loading