From 5e8ca4b417dc30aefed03a7cf7e0759051d0fb6a Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Mon, 29 Jul 2024 14:32:29 -0400 Subject: [PATCH] Fully distribute network unattributed costs --- .../reporting_ocpgcpcostlineitem_daily_summary_resource_id.sql | 2 -- .../trino_sql/reporting_ocpawscostlineitem_daily_summary.sql | 2 -- .../trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql | 2 -- 3 files changed, 6 deletions(-) diff --git a/koku/masu/database/trino_sql/gcp/openshift/reporting_ocpgcpcostlineitem_daily_summary_resource_id.sql b/koku/masu/database/trino_sql/gcp/openshift/reporting_ocpgcpcostlineitem_daily_summary_resource_id.sql index 62261f0d52..23b06cd841 100644 --- a/koku/masu/database/trino_sql/gcp/openshift/reporting_ocpgcpcostlineitem_daily_summary_resource_id.sql +++ b/koku/masu/database/trino_sql/gcp/openshift/reporting_ocpgcpcostlineitem_daily_summary_resource_id.sql @@ -762,7 +762,6 @@ INSERT INTO hive.{{schema | sqlsafe}}.reporting_ocpgcpcostlineitem_project_daily pod_cost, pod_credit, tags, - cost_category_id, gcp_source, ocp_source, year, @@ -802,7 +801,6 @@ SELECT gcp.uuid as gcp_uuid, max(gcp.unblended_cost) AS pod_cost, cast(NULL AS double) AS pod_credit, max(gcp.labels) as tags, - max(ocp.cost_category_id) as cost_category_id, {{gcp_source_uuid}} as gcp_source, {{ocp_source_uuid}} as ocp_source, cast(year(max(gcp.usage_start)) as varchar) as year, diff --git a/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql b/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql index 01a05e9b78..539e6a09ce 100644 --- a/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql +++ b/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql @@ -779,7 +779,6 @@ INSERT INTO hive.{{schema | sqlsafe}}.reporting_ocpawscostlineitem_project_daily pod_labels, tags, aws_cost_category, - cost_category_id, aws_source, ocp_source, year, @@ -823,7 +822,6 @@ SELECT max(ocp.pod_labels), cast(NULL AS varchar) AS tags, cast(NULL AS varchar) AS aws_cost_category, - max(cost_category_id), max({{aws_source_uuid}}) AS aws_source, max({{ocp_source_uuid}}) AS ocp_source, max(cast(year(aws.usage_start) AS varchar)) AS year, diff --git a/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql b/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql index aa55e1c20c..182ab56709 100644 --- a/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql +++ b/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql @@ -906,7 +906,6 @@ INSERT INTO hive.{{schema | sqlsafe}}.reporting_ocpazurecostlineitem_project_dai pod_cost, project_markup_cost, tags, - cost_category_id, azure_source, ocp_source, year, @@ -939,7 +938,6 @@ SELECT azure.uuid as azure_uuid, max(cast(azure.pretax_cost as decimal(24,9))) as pod_cost, max(cast(azure.pretax_cost as decimal(24,9))) * cast({{markup}} as decimal(24,9)) as project_markup_cost, max(azure.tags) as tags, - max(ocp.cost_category_id) as cost_category_id, {{azure_source_uuid}} as azure_source, {{ocp_source_uuid}} as ocp_source, max(azure.year) as year,