[COST-5548] Remove usage related to unattributed storage (#5326)

* [COST-5548] Remove usage related to unattributed storage

Co-authored-by: Luke Couzens <[email protected]>

Author: myersCody

koku/api/report/aws/openshift/provider_map.py

@@ -207,7 +207,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                                 Coalesce(F(self.markup_cost), Value(0, output_field=DecimalField()))
                                 * Coalesce("exchange_rate", Value(1, output_field=DecimalField()))
                             ),
-                            "usage": Sum(F("usage_amount")),
+                            "usage": Sum(Coalesce(F("usage_amount"), Value(0, output_field=DecimalField()))),
                             "usage_units": Coalesce(Max("unit"), Value("GB-Mo")),
                         },
                         "annotations": {
@@ -249,7 +249,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                             ),
                             # the `currency_annotation` is inserted by the `annotations` property of the query-handler
                             "cost_units": Coalesce("currency_annotation", Value("USD", output_field=CharField())),
-                            "usage": Sum("usage_amount"),
+                            "usage": Sum(Coalesce(F("usage_amount"), Value(0, output_field=DecimalField()))),
                             "usage_units": Coalesce(Max("unit"), Value("GB-Mo")),
                             "clusters": ArrayAgg(Coalesce("cluster_alias", "cluster_id"), distinct=True),
                             "source_uuid": ArrayAgg(
@@ -303,7 +303,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                                 Coalesce(F(self.markup_cost), Value(0, output_field=DecimalField()))
                                 * Coalesce("exchange_rate", Value(1, output_field=DecimalField()))
                             ),
-                            "usage": Sum(F("usage_amount")),
+                            "usage": Sum(Coalesce(F("usage_amount"), Value(0, output_field=DecimalField()))),
                             "usage_units": Coalesce(Max("unit"), Value("GB-Mo")),
                         },
                         "aggregate_key": "usage_amount",
@@ -346,7 +346,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                             ),
                             # the `currency_annotation` is inserted by the `annotations` property of the query-handler
                             "cost_units": Coalesce("currency_annotation", Value("USD", output_field=CharField())),
-                            "usage": Sum("usage_amount"),
+                            "usage": Sum(Coalesce(F("usage_amount"), Value(0, output_field=DecimalField()))),
                             "usage_units": Coalesce(Max("unit"), Value("Hrs")),
                             "clusters": ArrayAgg(Coalesce("cluster_alias", "cluster_id"), distinct=True),
                             "source_uuid": ArrayAgg(

koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql

@@ -631,7 +631,11 @@ SELECT  cast(uuid() as varchar) as aws_uuid, -- need a new uuid or it will dedup
     max(aws.availability_zone) as availability_zone,
     max(aws.region) as region,
     max(aws.unit) as unit,
-    max(aws.usage_amount) as usage_amount,
+    CASE
+        WHEN max(ocp.persistentvolumeclaim) = ''
+            THEN cast(NULL as double)
+        ELSE max(aws.usage_amount)
+    END as usage_amount,
     max(aws.currency_code) as currency_code,
     max(ocp.persistentvolumeclaim_capacity_gigabyte) / max(aws_disk.capacity) * max(aws.unblended_cost)  as unblended_cost,
     (max(persistentvolumeclaim_capacity_gigabyte) / max(aws_disk.capacity) * max(aws.unblended_cost)) * cast({{markup}} as decimal(24,9)) as markup_cost,
@@ -686,7 +690,7 @@ WHERE ocp.source = {{ocp_source_uuid}}
     AND aws.month = {{month}}
     -- Filter out Node Network Costs since they cannot be attributed to a namespace and are accounted for later
     AND aws.data_transfer_direction IS NULL
-    AND ocp.namespace != 'Storage Unattributed'
+    AND ocp.namespace != 'Storage unattributed'
     AND aws.resource_id_matched = True
 GROUP BY aws.uuid, ocp.namespace, ocp.pod_labels, ocp.volume_labels
 {% endif %}
@@ -769,7 +773,7 @@ SELECT  cast(uuid() as varchar) as aws_uuid, -- need a new uuid or it will dedup
     max(aws.availability_zone) as availability_zone,
     max(aws.region) as region,
     max(aws.unit) as unit,
-    max(aws.usage_amount) as usage_amount,
+    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,
@@ -805,7 +809,7 @@ WHERE ocp.source = {{ocp_source_uuid}}
     AND aws.month = {{month}}
     -- Filter out Node Network Costs since they cannot be attributed to a namespace and are accounted for later
     AND aws.data_transfer_direction IS NULL
-    AND ocp.namespace != 'Storage Unattributed'
+    AND ocp.namespace != 'Storage unattributed'
     AND aws_disk.capacity != pv_cap.total_pv_capacity -- prevent inserting zero cost rows
 GROUP BY aws.uuid, aws.resource_id
 {% endif %}